Merge branch 'b0.9' into FixResourceJoin

golemfactory · Oct 26, 2017 · e865ea9 · e865ea9
2 parents d72a5ba + 59a44a6
commit e865ea9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/golem/client.py b/golem/client.py
@@ -758,13 +758,13 @@ def set_rpc_server(self, rpc_server):
     def change_config(self, new_config_desc, run_benchmarks=False):
         self.config_desc = self.config_approver.change_config(new_config_desc)
         self.cfg.change_config(self.config_desc)
-        self.p2pservice.change_config(self.config_desc)
         self.upsert_hw_preset(HardwarePresets.from_config(self.config_desc))
+
+        if self.p2pservice:
+            self.p2pservice.change_config(self.config_desc)
         if self.task_server:
-            self.task_server.change_config(
-                self.config_desc,
-                run_benchmarks=run_benchmarks
-            )
+            self.task_server.change_config(self.config_desc,
+                                           run_benchmarks=run_benchmarks)
         dispatcher.send(
             signal='golem.monitor',
             event='config_update',