From: Frederik Gladhorn <gladhorn@kde.org>
Date: Tue, 9 Oct 2007 15:15:18 +0000 (+0000)
Subject: Prevent crash when converter tries to access KGlobal::locale().
X-Git-Tag: v3.95.0~15
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=f9d099ceede58ad06f17d48229d77eeeb9fa02bc;p=libqmvoc.git

Prevent crash when converter tries to access KGlobal::locale().

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=723408
---

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index efd92b1..cece426 100644
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -1215,7 +1215,11 @@ bool KEduVocKvtmlReader::addLanguage( int languageId, const QString& locale)
         if ( !locale.isEmpty() ) {      // no definition in first entry
             m_doc->identifier(languageId).setLocale(locale);
 
-            QString languageName = KGlobal::locale()->languageCodeToName(locale);
+            QString languageName;
+            if (KGlobal::locale()) {
+                // when using from qt-only apps this would crash (converter)
+                languageName = KGlobal::locale()->languageCodeToName(locale);
+            }
             if ( languageName.isEmpty() ) {
                 languageName = locale;
             }