fix bugs -'stop stardict when user click stop' and 'nacional char in words list'

[mdictionary] / src / plugins / stardict / UncompressedReader.cpp

diff --git a/src/plugins/stardict/UncompressedReader.cpp b/src/plugins/stardict/UncompressedReader.cpp
index 6129e6a..d4370c5 100644 (file)
--- a/src/plugins/stardict/UncompressedReader.cpp
+++ b/src/plugins/stardict/UncompressedReader.cpp
@@ -1,5 +1,5 @@
 #include "UncompressedReader.h"
-
+#include "QDebug"
 
 UncompressedReader::UncompressedReader(QObject *parent) :
         StarDictReader(parent) {
@@ -27,10 +27,14 @@ void UncompressedReader::close() {
 }
 
 QChar UncompressedReader::readChar() {
-    char c[1];
-
-    _stream.readRawData(c, 1);
-    return QChar(c[0]);
+    char c[2]={0};
+    _stream.readRawData(c,1);
+    QString cha(QString::fromUtf8(c));
+    if(!cha.at(0).isLetter() && c[0]!=0){
+        _stream.readRawData(c+1,1);
+        cha=QString::fromUtf8(c);
+    }
+    return cha.at(0);
 }
 
 QString UncompressedReader::readKeyword() {