--- qsampler/trunk/src/qsamplerMainForm.ui.h	2005/01/18 11:29:01	341
+++ qsampler/trunk/src/qsamplerMainForm.ui.h	2005/01/18 13:53:04	344
@@ -205,9 +205,6 @@
     // We got options?
     m_pOptions = pOptions;
 
-	// Set initial instrument name display mode.
-    qsamplerChannel::setInstrumentNames(m_pOptions->bInstrumentNames);
-
     // Some child forms are to be created right now.
     m_pMessages = new qsamplerMessages(this);
     // Set message defaults...
@@ -963,7 +960,6 @@
         int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;
         bool    bOldCompletePath    = m_pOptions->bCompletePath;
         int     iOldMaxRecentFiles  = m_pOptions->iMaxRecentFiles;
-        bool    bOldInstrumentNames = m_pOptions->bInstrumentNames;
         // Load the current setup settings.
         pOptionsForm->setup(m_pOptions);
         // Show the setup dialog...
@@ -977,9 +973,6 @@
                 updateMessagesCapture();
             }
             // Check wheather something immediate has changed.
-            if (( bOldInstrumentNames && !m_pOptions->bInstrumentNames) ||
-                (!bOldInstrumentNames &&  m_pOptions->bInstrumentNames))
-                qsamplerChannel::setInstrumentNames(m_pOptions->bInstrumentNames);
             if (( bOldCompletePath && !m_pOptions->bCompletePath) ||
                 (!bOldCompletePath &&  m_pOptions->bCompletePath) ||
                 (iOldMaxRecentFiles != m_pOptions->iMaxRecentFiles))