summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.vuorela@jolla.com>2020-04-22 17:43:06 +0300
committerPekka Vuorela <pekka.vuorela@jolla.com>2020-04-22 17:44:18 +0300
commitb13dec2952c1e426cb36a964f1c7312b9c4ec4f5 (patch)
tree50f5286818c469aa9e89676e6f6545cd83a0c815
parented015a5376f021cfeb61dc890201c68d2f11392d (diff)
downloadlibmediaart-b13dec2952c1e426cb36a964f1c7312b9c4ec4f5.tar.gz
Fix Qt5 backend crashing when running in Qt application
Creating a dummy QCoreApplication instance is bad in itself, but even worse when running in an app that already has one.
-rw-r--r--libmediaart/extractqt.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmediaart/extractqt.cpp b/libmediaart/extractqt.cpp
index 6114270..580f3dd 100644
--- a/libmediaart/extractqt.cpp
+++ b/libmediaart/extractqt.cpp
@@ -59,6 +59,10 @@ media_art_plugin_init (gint max_width)
max_width_in_bytes = max_width;
#ifdef HAVE_QT5
+ if (QCoreApplication::instance()) {
+ // avoid a new instance if already running inside a qt app
+ return;
+ }
app = new QCoreApplication (argc, argv);
#else /* HAVE_QT4 (we fallback to Qt4) */
app = new QApplication (argc, argv, QApplication::Tty);