Merge f54922a into ad05b26

pyiron · Dec 5, 2018 · 1601233 · 1601233
2 parents ad05b26 + f54922a
commit 1601233
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pyiron/base/server/generic.py b/pyiron/base/server/generic.py
@@ -190,11 +190,14 @@ def queue(self, new_scheduler):
         """
         if new_scheduler:
             cores = self.cores
+            run_time = self.run_time
             self._scheduler.active_scheduler = new_scheduler
             self.run_mode.queue = True
-            if self._scheduler.active_scheduler.minimum_number_of_cores < cores and \
-                    cores < self._scheduler.active_scheduler.maximum_number_of_cores:
+            if self._scheduler.active_scheduler.minimum_number_of_cores < cores < \
+                    self._scheduler.active_scheduler.maximum_number_of_cores:
                 self.cores = cores
+            if run_time is not None:
+                self.run_time = run_time
 
     @property
     def queue_id(self):