-worker shutdown on close request

-moved "no settings"-alert after disabling tabs
-fixed bug in saving of client secret
-preselect rest radio buttons if no settings found

src/de/deadlocker8/budgetmaster/main/_de.properties

 app.name=BudgetMaster
-version.code=3
-version.name=1.2.0
+version.code=4
+version.name=1.3.0_alpha
 version.date=25.05.17
 author=Robert Goldmann
 

src/de/deadlocker8/budgetmaster/ui/Controller.java

@@ -76,6 +76,11 @@ public class Controller
 		this.bundle = bundle;
 		this.settings = settings;
 		
+		stage.setOnCloseRequest((event)->{
+			Worker.shutdown();
+			System.exit(0);
+		});
+		
 		currentDate = DateTime.now();
 		labelMonth.setText(currentDate.toString("MMMM yyyy"));
 		
@@ -149,9 +154,9 @@ public class Controller
 		if(!settings.isComplete())
 		{			
 			Platform.runLater(() -> {
-				AlertGenerator.showAlert(AlertType.INFORMATION, "Hinweis", "", "Vor der ersten Benutzung musst du deine Serverdaten eingeben.", icon, stage, null, false);
 				toggleAllTabsExceptSettings(true);
 				tabPane.getSelectionModel().select(tabSettings);
+				AlertGenerator.showAlert(AlertType.INFORMATION, "Hinweis", "", "Vor der ersten Benutzung musst du deine Serverdaten eingeben.", icon, stage, null, false);
 			});
 		}
 		else

src/de/deadlocker8/budgetmaster/ui/SettingsController.java

@@ -61,6 +61,7 @@ public class SettingsController
 		this.controller = controller;
 		
 		textFieldClientSecret.setText("******");
+		radioButtonRestDeactivated.setSelected(true);
 		
 		if(controller.getSettings().isComplete())
 		{
@@ -162,6 +163,7 @@ public class SettingsController
 		{
 			if(!clientSecret.equals("******"))
 			{
+				System.out.println(clientSecret);
 				controller.getSettings().setClientSecret(HashUtils.hash(clientSecret, Helpers.SALT));
 			}
 			
@@ -177,9 +179,25 @@ public class SettingsController
 		else
 		{
 			Settings settings = new Settings();
+			
+			if(!clientSecret.equals("******"))
+			{
 				settings.setClientSecret(HashUtils.hash(clientSecret, Helpers.SALT));
-			settings.setUrl(url);
+			}
+			else
+			{
+				settings.setClientSecret(controller.getSettings().getClientSecret());
+			}
+			
+			if(!secret.equals("******"))
+			{
 				settings.setSecret(HashUtils.hash(secret, Helpers.SALT));
+			}
+			else
+			{
+				settings.setSecret(controller.getSettings().getSecret());
+			}
+			settings.setUrl(url);			
 			settings.setCurrency(currency);
 			settings.setRestActivated(radioButtonRestActivated.isSelected());
 			settings.setTrustedHosts(trustedHosts);

src/de/deadlocker8/budgetmasterserver/main/_de.properties

 app.name=BudgetMasterServer
-version.code=3
-version.name=1.2.0
+version.code=4
+version.name=1.3.0_alpha
 version.date=25.05.17
 author=Robert Goldmann
\ No newline at end of file