From 9f6b6b99f3fa629b5d914ad7c5925ec3eaae9b09 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 2 Sep 2012 16:37:43 +0200 Subject: [PATCH 1/2] Fixed a regression introduced by my previous bug fix. --- openlp/core/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index e28669fa5..ed72fbe1c 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -103,8 +103,13 @@ class OpenLP(QtGui.QApplication): Run the OpenLP application. """ self.eventLoopIsActive = False - # On Windows, the args passed into the constructor are - # ignored. Not very handy, so set the ones we want to use. + # On Windows, the args passed into the constructor are ignored. Not + # very handy, so set the ones we want to use. On Linix and FreeBSD, in + # order to set the WM_CLASS property for X11, we pass "OpenLP" in as a + # command line argument. This interferes with files being passed in as + # command line arguments, so we remove it from the list. + if 'OpenLP' in args: + args.remove('OpenLP') self.args.extend(args) # provide a listener for widgets to reqest a screen update. QtCore.QObject.connect(Receiver.get_receiver(), From dcaf1f093450b5514b6b523fd95313dfb8e5f4ff Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 2 Sep 2012 16:53:51 +0200 Subject: [PATCH 2/2] typo --- openlp/core/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index ed72fbe1c..548a18c79 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -104,7 +104,7 @@ class OpenLP(QtGui.QApplication): """ self.eventLoopIsActive = False # On Windows, the args passed into the constructor are ignored. Not - # very handy, so set the ones we want to use. On Linix and FreeBSD, in + # very handy, so set the ones we want to use. On Linux and FreeBSD, in # order to set the WM_CLASS property for X11, we pass "OpenLP" in as a # command line argument. This interferes with files being passed in as # command line arguments, so we remove it from the list.