Add missing checks.

2 files changed, 21 insertions, 10 deletions

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index a575b7054..1829a55ba 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -1304,12 +1304,15 @@ void ChatWindow::initTradeFilter()
     if (!stat(tradeListName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
     {
         tradeFile.open(tradeListName.c_str(), std::ios::in);
-        char line[100];
-        while (tradeFile.getline(line, 100))
+        if (tradeFile.is_open())
         {
-            std::string str = line;
-            if (!str.empty())
-                mTradeFilter.push_back(str);
+            char line[100];
+            while (tradeFile.getline(line, 100))
+            {
+                std::string str = line;
+                if (!str.empty())
+                    mTradeFilter.push_back(str);
+            }
         }
         tradeFile.close();
     }
@@ -1466,12 +1469,15 @@ void ChatWindow::loadCustomList()
     if (!stat(listName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
     {
         listFile.open(listName.c_str(), std::ios::in);
-        char line[101];
-        while (listFile.getline(line, 100))
+        if (listFile.is_open())
         {
-            std::string str = line;
-            if (!str.empty())
-                mCustomWords.push_back(str);
+            char line[101];
+            while (listFile.getline(line, 100))
+            {
+                std::string str = line;
+                if (!str.empty())
+                    mCustomWords.push_back(str);
+            }
         }
         listFile.close();
     }
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 7578cbf7b..fdfea5d15 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -312,6 +312,11 @@ void ShopWindow::loadList()
     if (!stat(shopListName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
     {
         shopFile.open(shopListName.c_str(), std::ios::in);
+        if (!shopFile.is_open())
+        {
+            shopFile.close();
+            return;
+        }
         char line[101];
         while (shopFile.getline(line, 100))
         {