From 72cb39c2b2e71d381db51583e2f010fd84a598d5 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 20 Nov 2015 18:18:19 +0000
Subject: [PATCH] FSLEyesFrame layout/restore logic was broken.
---
fsl/fsleyes/frame.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/fsl/fsleyes/frame.py b/fsl/fsleyes/frame.py
index 7346c5786..34060c109 100644
--- a/fsl/fsleyes/frame.py
+++ b/fsl/fsleyes/frame.py
@@ -474,10 +474,6 @@ class FSLEyesFrame(wx.Frame):
position = self.__parseSavedPoint(fslsettings.read('frameposition'))
layout = fslsettings.read('framelayout')
- # We can only restore a saved layout
- # if there is a saved layout to restore
- restore = restore and (layout is not None)
-
if (size is not None) and (position is not None):
# Turn the saved size/pos into
@@ -557,11 +553,14 @@ class FSLEyesFrame(wx.Frame):
self.Centre()
if restore:
- perspectives.applyPerspective(
- self,
- 'framelayout',
- layout,
- message=strings.messages[self, 'restoringLayout'],)
+ if layout is None:
+ perspectives.loadPerspective(self, 'default')
+ else:
+ perspectives.applyPerspective(
+ self,
+ 'framelayout',
+ layout,
+ message=strings.messages[self, 'restoringLayout'])
def __makeMenuBar(self):
--
GitLab