Merge branch 'master' of github.com:openscad/openscad

2 files changed, 12 insertions, 0 deletions

diff --git a/src/MainWindow.h b/src/MainWindow.h
index fa66c19..43ab273 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -80,6 +80,7 @@ private:
 		static_cast<MainWindow*>(userdata)->console->append(msg);
 	}
 	void loadViewSettings();
+	void loadDesignSettings();
 
 private slots:
 	void actionNew();
diff --git a/src/mainwin.cc b/src/mainwin.cc
index c732cd2..0492dac 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -385,6 +385,7 @@ MainWindow::MainWindow(const QString &filename)
 	viewModeThrownTogether();
 #endif
 	loadViewSettings();
+	loadDesignSettings();
 
 	setAcceptDrops(true);
 	clearCurrentOutput();
@@ -420,6 +421,14 @@ MainWindow::loadViewSettings(){
 	}
 }
 
+void
+MainWindow::loadDesignSettings()
+{
+	QSettings settings;
+	if (settings.value("design/autoReload").toBool())
+		designActionAutoReload->setChecked(true);
+}
+
 MainWindow::~MainWindow()
 {
 	if (root_module)
@@ -1063,6 +1072,8 @@ void MainWindow::checkAutoReload()
 
 void MainWindow::autoReloadSet(bool on)
 {
+	QSettings settings;
+	settings.setValue("design/autoReload",designActionAutoReload->isChecked());
 	if (on) {
 		autoReloadInfo = QString();
 		autoReloadTimer->start(200);