Merge branch 'master' into ed_refac

2015-01-08 10:49:09 +01:00
parent e0dbfa696e 471cb04dc9
commit 7f2f9f2685
23 changed files with 120 additions and 96 deletions
--- a/include/SetupDialog.h
+++ b/include/SetupDialog.h
@@ -91,6 +91,7 @@ private slots:
 	void toggleWarnAfterSetup( bool _enabled );
 	void toggleDisplaydBV( bool _enabled );
 	void toggleMMPZ( bool _enabled );
+	void toggleDisableBackup( bool _enabled );
 	void toggleHQAudioDev( bool _enabled );

 	void openWorkingDir();
@@ -124,6 +125,7 @@ private:
 	bool m_warnAfterSetup;
 	bool m_displaydBV;
 	bool m_MMPZ;
+	bool m_disableBackup;
 	bool m_hqAudioDev;