From d07fe1b9fcd9863797763a656c8f8a536323eba4 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Tue, 7 Apr 2015 20:06:37 +0100
Subject: [PATCH] Bugfix: NullPointerException (wrong order)

---
 src/com/sheepit/client/standalone/swing/SettingsLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/sheepit/client/standalone/swing/SettingsLoader.java b/src/com/sheepit/client/standalone/swing/SettingsLoader.java
index 3e1b33e..150bd21 100644
--- a/src/com/sheepit/client/standalone/swing/SettingsLoader.java
+++ b/src/com/sheepit/client/standalone/swing/SettingsLoader.java
@@ -177,7 +177,7 @@ public class SettingsLoader {
 			config.setPassword(password);
 		}
 		
-		if ((config.getComputeMethod() == null && computeMethod != null) || (config.getComputeMethod() != ComputeType.valueOf(computeMethod) && computeMethod != null)) {
+		if ((config.getComputeMethod() == null && computeMethod != null) || (computeMethod != null && config.getComputeMethod() != ComputeType.valueOf(computeMethod))) {
 			config.setComputeMethod(ComputeType.valueOf(computeMethod));
 		}
 		if (config.getGPUDevice() == null && gpu != null) {