From 226993eecee22e3cb39fc30aedfef587cc58330c Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 1 Dec 2014 18:44:37 +0100
Subject: - added error handling when a file can't be deleted from vfs - minor
 bugfixes

---
 src/mainwindow.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d3c108fc..101c8f81 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4334,7 +4334,7 @@ void MainWindow::installTranslator(const QString &name)
   QTranslator *translator = new QTranslator(this);
   QString fileName = name + "_" + m_CurrentLanguage;
   if (!translator->load(fileName, qApp->applicationDirPath() + "/translations")) {
-    if (m_CurrentLanguage != "en_US") {
+    if ((m_CurrentLanguage != "en-US") && (m_CurrentLanguage != "en_US")) {
       qWarning("localization file %s not found", qPrintable(fileName));
     } // we don't actually expect localization files for english
   }
@@ -5238,6 +5238,9 @@ void MainWindow::on_espList_customContextMenuRequested(const QPoint &pos)
 
 void MainWindow::on_groupCombo_currentIndexChanged(int index)
 {
+  if (m_ModListSortProxy == NULL) {
+    return;
+  }
   QAbstractProxyModel *newModel = NULL;
   switch (index) {
     case 1: {
-- 
cgit v1.3.1