Changeset 540

Timestamp:

09/29/08 01:36:40 (2 months ago)

Author:

gabriel

Message:

Merge rev 528:530 from trunk

Files:

• branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.cpp (modified) (2 diffs)

branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -643 +643 @@
-        assert( drumkitInfo );
-
-
-        QString sPreDrumkitName = Hydrogen::get_instance()->getCurrentDrumkitname();
-
@@ -665 +664 @@
-        }
-
+        if ( preDrumkitInfo == NULL ){
+                QMessageBox::warning( this, "Hydrogen", QString( "The current loaded song missing his soundlibrary.\nPlease load a existing soundlibrary first") );
+                return;
+        }
-        assert( preDrumkitInfo );
-