--- qsampler/trunk/src/qsamplerChannel.cpp	2007/11/22 14:17:24	1510
+++ qsampler/trunk/src/qsamplerChannel.cpp	2007/11/26 18:24:38	1528
@@ -707,9 +707,9 @@
 		appendMessagesClient("lscp_edit_channel_instrument");
 		appendMessagesError(QObject::tr(
 			"Could not launch an appropriate instrument editor "
-			"for the given instrument!\n"
+			"for the given instrument!\n\n"
 			"Make sure you have an appropriate "
-			"instrument editor like 'gigedit' installed\n"
+			"instrument editor like 'gigedit' installed "
 			"and that it placed its mandatory DLL file "
 			"into the sampler's plugin directory.")
 		);
@@ -724,7 +724,7 @@
 
 	appendMessagesError(QObject::tr(
 		"Sorry, QSampler was compiled for a version of liblscp "
-		"which lacks this feature.\n"
+		"which lacks this feature.\n\n"
 		"You may want to update liblscp and recompile QSampler afterwards.")
 	);
 
@@ -835,6 +835,10 @@
 			RIFF::File *pRiff
 				= new RIFF::File(sInstrumentFile.toUtf8().constData());
 			gig::File  *pGig  = new gig::File(pRiff);
+#if HAVE_LIBGIG_SETAUTOLOAD
+			// prevent sleepy response time on large .gig files
+			pGig->SetAutoLoad(false);
+#endif
 			gig::Instrument *pInstrument = pGig->GetFirstInstrument();
 			while (pInstrument) {
 				instlist.append((pInstrument->pInfo)->Name.c_str());
@@ -867,6 +871,10 @@
 			RIFF::File *pRiff
 				= new RIFF::File(sInstrumentFile.toUtf8().constData());
 			gig::File *pGig = new gig::File(pRiff);
+#if HAVE_LIBGIG_SETAUTOLOAD
+			// prevent sleepy response time on large .gig files
+			pGig->SetAutoLoad(false);
+#endif
 			int iIndex = 0;
 			gig::Instrument *pInstrument = pGig->GetFirstInstrument();
 			while (pInstrument) {