Fix: -renderbucket-size option not applied if configuration file does…

…n't exist

src/com/sheepit/client/SettingsLoader.java

@@ -394,6 +394,19 @@ public void merge(Configuration config) {
 				config.setRenderbucketSize(config.getGPUDevice().getRenderbucketSize());
 			}
 		}
+		else if (config.getGPUDevice() != null) {
+			// The order of conditions is important to ensure the priority or app arguments, then the config file and finally the recommended size (if none
+			// specified or already in config file).
+			if (config.getRenderbucketSize() >= 32) {
+				config.getGPUDevice().setRenderbucketSize(config.getRenderbucketSize());
+			}
+			else if (renderbucketSize != null) {
+				config.getGPUDevice().setRenderbucketSize(Integer.parseInt(renderbucketSize));
+			}
+			else {
+				config.getGPUDevice().setRenderbucketSize(config.getGPUDevice().getRecommendedBucketSize());
+			}
+		}
 
 		if (config.getNbCores() == -1 && cores != null) {
 			config.setNbCores(Integer.valueOf(cores));

src/com/sheepit/client/hardware/gpu/GPUDevice.java

@@ -88,8 +88,13 @@ public void setOldId(String id) {
 	public int getRenderbucketSize() {
 		return this.renderBucketSize;
 	}
+
+	public int getRecommendedBucketSize() {
+		this.setRenderbucketSize(null);
+		return this.renderBucketSize;
+	}
 
-	public void setRenderbucketSize(int proposedRenderbucketSize) {
+	public void setRenderbucketSize(Integer proposedRenderbucketSize) {
 		int renderBucketSize = 32;
 		GPULister gpu;
 
@@ -108,7 +113,10 @@ else if (type.equals("OPENCL")) {
 			return;
 		}
 
-		if (proposedRenderbucketSize >= 32) {
+		if (proposedRenderbucketSize == null) {
+			renderBucketSize = gpu.getRecommendedRenderBucketSize(getMemory());
+		}
+		else if (proposedRenderbucketSize >= 32) {
 			if (proposedRenderbucketSize <= gpu.getMaximumRenderBucketSize(getMemory())) {
 				renderBucketSize = proposedRenderbucketSize;
 			}