--- qsampler/trunk/src/qsamplerOptions.cpp	2007/11/22 11:10:44	1509
+++ qsampler/trunk/src/qsamplerOptions.cpp	2007/11/26 16:00:21	1527
@@ -69,7 +69,13 @@
 	bStdoutCapture   = m_settings.value("/StdoutCapture", true).toBool();
 	bCompletePath    = m_settings.value("/CompletePath", true).toBool();
 	iMaxRecentFiles  = m_settings.value("/MaxRecentFiles", 5).toInt();
+// if libgig provides a fast way to retrieve instrument names even for large
+// .gig files, then we enable this feature by default
+#if HAVE_LIBGIG_SETAUTOLOAD
+	bInstrumentNames = m_settings.value("/InstrumentNames", true).toBool();
+#else
 	bInstrumentNames = m_settings.value("/InstrumentNames", false).toBool();
+#endif
 	m_settings.endGroup();
 
 	// And go into view options group.