[OMPT-svn-commit] SF.net SVN: modplug:[282] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 282
          http://modplug.svn.sourceforge.net/modplug/?rev=282&view=rev
Author:   saga-games
Date:     2009-07-06 17:34:31 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Moptions.cpp

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2009-07-06 15:27:09 UTC (rev 281)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2009-07-06 17:34:31 UTC (rev 282)
@@ -2208,15 +2208,22 @@
 	SetDefaultDirectory(szInstrDir, DIR_INSTRUMENTS);
 	SetDefaultDirectory(szVstDir, DIR_PLUGINS);
 	SetDefaultDirectory(szPresetDir, DIR_PLUGINPRESETS);
+	return TRUE;
+}
 
-	// This shouldn't be here (misc options)
-	m_wndToolBar.EnableFlatButtons(m_dwPatternSetup & PATTERN_FLATBUTTONS);
-	UpdateAllViews(HINT_MPTOPTIONS, NULL);
-	if (m_dwPatternSetup & PATTERN_MUTECHNMODE)
+BOOL CMainFrame::SetupMiscOptions()
+//---------------------------------
+{
+	if (CMainFrame::m_dwPatternSetup & PATTERN_MUTECHNMODE)
 		CSoundFile::gdwSoundSetup |= SNDMIX_MUTECHNMODE;
 	else
 		CSoundFile::gdwSoundSetup &= ~SNDMIX_MUTECHNMODE;
-	return TRUE;
+
+	m_wndToolBar.EnableFlatButtons(m_dwPatternSetup & PATTERN_FLATBUTTONS);
+
+	UpdateTree(NULL, HINT_MPTOPTIONS);
+	UpdateAllViews(HINT_MPTOPTIONS, NULL);
+	return true;
 }
 
 

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2009-07-06 15:27:09 UTC (rev 281)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2009-07-06 17:34:31 UTC (rev 282)
@@ -571,6 +571,7 @@
 	void SwitchToActiveView();
 	BOOL SetupSoundCard(DWORD q, DWORD rate, UINT nbits, UINT chns, UINT bufsize, LONG wd);
 	BOOL SetupDirectories(LPCTSTR szModDir, LPCTSTR szSampleDir, LPCTSTR szInstrDir, LPCTSTR szVstDir, LPCTSTR szPresetDir);
+	BOOL SetupMiscOptions();
 	BOOL SetupPlayer(DWORD, DWORD, BOOL bForceUpdate=FALSE);
 	BOOL SetupMidi(DWORD d, LONG n);
 	void SetPreAmp(UINT n);

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2009-07-06 15:27:09 UTC (rev 281)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2009-07-06 17:34:31 UTC (rev 282)
@@ -782,12 +782,14 @@
 		if (bCheck) CMainFrame::m_dwPatternSetup |= mask; else CMainFrame::m_dwPatternSetup &= ~mask;
 		m_CheckList.SetCheck(i, (bCheck) ? TRUE : FALSE);
 	}
+
 	CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
 	if (pMainFrm)
 	{
 		pMainFrm->SetupDirectories(szModDir, szSmpDir, szInsDir, szVstDir, szPresetDir);
-		pMainFrm->UpdateTree(NULL, HINT_MPTOPTIONS);
+		pMainFrm->SetupMiscOptions();
 	}
+
 	CPropertyPage::OnOK();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.