Revision: 17082
http://translate.svn.sourceforge.net/translate/?rev=17082&view=rev
Author: friedelwolff
Date: 2011-01-07 07:38:52 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Handle errors correctly so that the welcome screen shows if the file couldn't be opened. This fixed the reintroduced bug 1433.
Modified Paths:
--------------
src/trunk/virtaal/virtaal/main.py
Modified: src/trunk/virtaal/virtaal/main.py
===================================================================
--- src/trunk/virtaal/virtaal/main.py 2011-01-06 19:51:28 UTC (rev 17081)
+++ src/trunk/virtaal/virtaal/main.py 2011-01-07 07:38:52 UTC (rev 17082)
@@ -70,8 +70,13 @@
if startupfile:
# Just call the open plainly - we want it done before we start the
# event loop.
- self._open_with_file(startupfile)
- self.defer(WelcomeScreenController, main_controller)
+ if self._open_with_file(startupfile):
+ self.defer(WelcomeScreenController, main_controller)
+ else:
+ # Something went wrong, and we have to show the welcome screen
+ wc = WelcomeScreenController(main_controller)
+ wc.activate()
+
else:
wc = WelcomeScreenController(main_controller)
wc.activate()
@@ -99,7 +104,7 @@
LanguageController(main_controller)
PlaceablesController(main_controller)
- main_controller.open_file(startupfile)
+ return main_controller.open_file(startupfile)
def _open_with_welcome(self):
from virtaal.controllers.unitcontroller import UnitController
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|