cancel in settningsdialog bugfix

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -843,7 +843,7 @@ void mainWindowImpl::callSettingsDialog() {
 
 	mySettingsDialog->exec();
 	
-	if (mySettingsDialog->getSettingsCorrect()) {
+	if (mySettingsDialog->result() == QDialog::Accepted && mySettingsDialog->getSettingsCorrect()) {
 		//Toolbox verstecken?
 		if (myConfig->readConfigInt("ShowLeftToolBox")) { groupBox_LeftToolBox->show(); }
 		else { groupBox_LeftToolBox->hide(); }

src/gui/qt/settingsdialog.ui

@@ -2246,22 +2246,6 @@ p, li { white-space: pre-wrap; }
   <include location="resources.qrc" />
  </resources>
  <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>settingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>340</x>
-     <y>576</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>listWidget</sender>
    <signal>currentRowChanged(int)</signal>
@@ -2310,5 +2294,37 @@ p, li { white-space: pre-wrap; }
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>settingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>471</x>
+     <y>496</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>354</x>
+     <y>472</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>settingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>559</x>
+     <y>498</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>599</x>
+     <y>497</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>