forked from openlp/openlp
Minor fixes
This commit is contained in:
parent
b83b6eccd1
commit
084da9c1bd
|
@ -305,7 +305,7 @@ def main(args=None):
|
||||||
Registry().register(u'openlp_core', app)
|
Registry().register(u'openlp_core', app)
|
||||||
app.setApplicationVersion(get_application_version()[u'version'])
|
app.setApplicationVersion(get_application_version()[u'version'])
|
||||||
# Instance check
|
# Instance check
|
||||||
if app.isAlreadyRunning():
|
if app.is_already_running():
|
||||||
sys.exit()
|
sys.exit()
|
||||||
# First time checks in settings
|
# First time checks in settings
|
||||||
if not Settings().value(u'general/has run wizard'):
|
if not Settings().value(u'general/has run wizard'):
|
||||||
|
@ -322,6 +322,6 @@ def main(args=None):
|
||||||
else:
|
else:
|
||||||
log.debug(u'Could not find default_translator.')
|
log.debug(u'Could not find default_translator.')
|
||||||
if not options.no_error_form:
|
if not options.no_error_form:
|
||||||
sys.excepthook = app.hookException
|
sys.excepthook = app.hook_exception
|
||||||
sys.exit(app.run(qt_args))
|
sys.exit(app.run(qt_args))
|
||||||
|
|
||||||
|
|
|
@ -26,14 +26,10 @@
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# 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.
|
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
|
from openlp.core.ui.media import MediaState
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue