From 7b1de0f995dac241d551a09de4a939e9617eb54b Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 30 Oct 2009 21:45:38 +0000
Subject: [PATCH] Move version check

---
 openlp.pyw                            | 1 +
 openlp/core/ui/mainwindow.py          | 1 -
 openlp/plugins/songs/lib/mediaitem.py | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp.pyw b/openlp.pyw
index ebd449bf8..4c0eb9b14 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -105,6 +105,7 @@ class OpenLP(QtGui.QApplication):
         if show_splash:
             # now kill the splashscreen
             self.splash.finish(self.mainWindow)
+        self.mainWindow.versionCheck()
         return self.exec_()
 
 def main():
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 4a79f6cae..d98a94d09 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -562,7 +562,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         screen_number = self.getMonitorNumber()
         self.mainDisplay.setup(screen_number)
         self.setFocus()
-        self.versionCheck()
         if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
             self.ServiceManagerContents.onLoadService(True)
         if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 0ca0756a6..fa236f96f 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -292,6 +292,7 @@ class SongMediaItem(MediaManagerItem):
         service_item.theme = song.theme_name
         service_item.editEnabled = True
         service_item.editId = item_id
+        service_item.verse_order = song.verse_order
         if song.lyrics.startswith(u'<?xml version='):
             songXML=SongXMLParser(song.lyrics)
             verseList = songXML.get_verses()