From cc66e0870a7cedb0f63f87fd1cd4e353103018e4 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Fri, 30 Apr 2021 20:11:54 +0000
Subject: check QTranslator::load result

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9879 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmpui/commandlinemanager.cpp | 6 ++++--
 src/qmmpui/mediaplayer.cpp        | 9 +++++----
 src/qmmpui/qmmpuiplugincache.cpp  | 6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/qmmpui')

diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index 9b241fb96..1b10ab788 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -62,8 +62,10 @@ void CommandLineManager::checkOptions()
                 if(!option->translation().isEmpty())
                 {
                     QTranslator *translator = new QTranslator(qApp);
-                    translator->load(option->translation() + Qmmp::systemLanguageID());
-                    qApp->installTranslator(translator);
+                    if(translator->load(option->translation() + Qmmp::systemLanguageID()))
+                        qApp->installTranslator(translator);
+                    else
+                        delete translator;
                 }
                 option->registerOprions();
             }
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index 29dfe7cec..16a458d47 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -36,10 +36,11 @@ MediaPlayer::MediaPlayer(QObject *parent)
         qFatal("StateHandler: only one instance is allowed");
     m_instance = this;
 
-    QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
-    translator->load(QString(":/libqmmpui_") + locale);
-    qApp->installTranslator(translator);
+    QTranslator *translator = new QTranslator(qApp);
+    if(translator->load(QString(":/libqmmpui_") + Qmmp::systemLanguageID()))
+        qApp->installTranslator(translator);
+    else
+        delete translator;
 
     m_core = new SoundCore(this);
     m_settings = new QmmpUiSettings(this);
diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp
index 4e3ced74c..1f484b0b4 100644
--- a/src/qmmpui/qmmpuiplugincache.cpp
+++ b/src/qmmpui/qmmpuiplugincache.cpp
@@ -199,8 +199,10 @@ void QmmpUiPluginCache::loadTranslation(const QString &translation)
     if(!translation.isEmpty())
     {
         QTranslator *translator = new QTranslator(qApp);
-        translator->load(translation + Qmmp::systemLanguageID());
-        qApp->installTranslator(translator);
+        if(translator->load(translation + Qmmp::systemLanguageID()))
+            qApp->installTranslator(translator);
+        else
+            delete translator;
     }
 }
 
-- 
cgit v1.2.3-13-gbd6f