From 4ab755c831e0d69e611ec246cd8c3f74420f8b15 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Tue, 23 Mar 2010 18:00:55 +0000 Subject: [PATCH] Don't try to load translations from a directory that contains another directory called "clementine". Fixes issue #88 --- src/main.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 656d190b8..710a1148c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,9 +23,17 @@ #endif void LoadTranslation(const QString& prefix, const QString& path) { + // QTranslator::load will try to open and read "clementine" if it exists, + // without checking if it's a file first. + QFileInfo maybe_clementine_directory(path + "/clementine"); + if (maybe_clementine_directory.exists() && !maybe_clementine_directory.isFile()) + return; + QTranslator* t = new QTranslator; - t->load(prefix + "_" + QLocale::system().name(), path); - QCoreApplication::installTranslator(t); + if (t->load(prefix + "_" + QLocale::system().name(), path)) + QCoreApplication::installTranslator(t); + else + delete t; } int main(int argc, char *argv[]) {