raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Tim Bentley 2013-02-03 16:44:03 +00:00
parent b83b6eccd1
commit 084da9c1bd
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/__init__.py
View File

@ -305,7 +305,7 @@ def main(args=None):
Registry().register(u'openlp_core', app)
app.setApplicationVersion(get_application_version()[u'version'])
# Instance check
if app.isAlreadyRunning():
if app.is_already_running():
sys.exit()
# First time checks in settings
if not Settings().value(u'general/has run wizard'):
@ -322,6 +322,6 @@ def main(args=None):
else:
log.debug(u'Could not find default_translator.')
if not options.no_error_form:
sys.excepthook = app.hookException
sys.excepthook = app.hook_exception
sys.exit(app.run(qt_args))

6
openlp/core/ui/media/mediaplayer.py
View File

@ -26,14 +26,10 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
<<<<<<< TREE
from openlp.core.lib import Registry
=======
"""
The :mod:`~openlp.core.ui.media.mediaplayer` module contains the MediaPlayer class.
"""
>>>>>>> MERGE-SOURCE
from openlp.core.lib import Registry
from openlp.core.ui.media import MediaState