diff options
| -rw-r--r-- | src/app/main.cpp | 8 | ||||
| -rw-r--r-- | src/qmmp/qmmpplugincache.cpp | 6 | ||||
| -rw-r--r-- | src/qmmp/visual.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/commandlinemanager.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/mediaplayer.cpp | 9 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuiplugincache.cpp | 6 |
6 files changed, 25 insertions, 16 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 53c9e72c2..2a1cab328 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -57,12 +57,12 @@ int main(int argc, char *argv[]) #endif QTranslator translator; QString locale = Qmmp::systemLanguageID(); - translator.load(QString(":/qmmp_") + locale); - a.installTranslator(&translator); + if(translator.load(QString(":/qmmp_") + locale)) + a.installTranslator(&translator); QTranslator qt_translator; - qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + locale); - a.installTranslator(&qt_translator); + if(qt_translator.load(QLibraryInfo::path(QLibraryInfo::TranslationsPath) + "/qtbase_" + locale)) + a.installTranslator(&qt_translator); QMMPStarter starter; diff --git a/src/qmmp/qmmpplugincache.cpp b/src/qmmp/qmmpplugincache.cpp index 545ca7959..70d96c491 100644 --- a/src/qmmp/qmmpplugincache.cpp +++ b/src/qmmp/qmmpplugincache.cpp @@ -204,8 +204,10 @@ void QmmpPluginCache::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; } } diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index e5860678e..ac1c1f550 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -269,8 +269,10 @@ void Visual::checkFactories() if(!factory->translation().isEmpty()) { QTranslator *translator = new QTranslator(qApp); - translator->load(factory->translation() + Qmmp::systemLanguageID()); - qApp->installTranslator(translator); + if(translator->load(factory->translation() + Qmmp::systemLanguageID())) + qApp->installTranslator(translator); + else + delete translator; } } } 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; } } |