1 files changed, 6 insertions, 3 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index eb056653..9b549419 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4295,11 +4295,14 @@ void Courtroom::music_random()
                              QTreeWidgetItemIterator::NotHidden |
                                  QTreeWidgetItemIterator::NoChildren);
   while (*it) {
-    clist += (*it);
+    if ((*it)->parent()->isExpanded()) {
+      clist += (*it);
+    }
     ++it;
   }
-  int i = qrand() % clist.length();
-  on_music_list_double_clicked(clist.at(i), 1);
+  if (clist.length() == 0)
+      return;
+  on_music_list_double_clicked(clist.at(qrand() % clist.length()), 1);
 }
 
 void Courtroom::music_list_expand_all() { ui_music_list->expandAll(); }