[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [lokalize/Applications/16.04] src: fix html markup detection, and a recently introduced crash on exi
From:       Nick Shaforostoff <shafff () ukr ! net>
Date:       2016-04-25 20:53:24
Message-ID: E1aunVU-0005f7-1l () scm ! kde ! org
[Download RAW message or body]

Git commit ef9ee25a72ef864be2da97e8001fe7947f9ed85b by Nick Shaforostoff.
Committed on 25/04/2016 at 20:52.
Pushed by shaforo into branch 'Applications/16.04'.

fix html markup detection, and a recently introduced crash on exit

BUG: 232416

M  +3    -0    src/editortab.cpp
M  +1    -1    src/tm/tmview.cpp

http://commits.kde.org/lokalize/ef9ee25a72ef864be2da97e8001fe7947f9ed85b

diff --git a/src/editortab.cpp b/src/editortab.cpp
index 5d7887e..c0ec98f 100644
--- a/src/editortab.cpp
+++ b/src/editortab.cpp
@@ -145,6 +145,9 @@ void EditorTab::initLater()
 
 EditorTab::~EditorTab()
 {
+    disconnect(m_catalog,&Catalog::signalNumberOfFuzziesChanged,this,&EditorTab::numberOfFuzziesChanged);
 +    disconnect(m_catalog,&Catalog::signalNumberOfEmptyChanged,this,&EditorTab::numberOfUntranslatedChanged);
 +
     if (!m_catalog->isEmpty())
     {
         emit fileAboutToBeClosed();
diff --git a/src/tm/tmview.cpp b/src/tm/tmview.cpp
index ea09c3e..9066a2e 100644
--- a/src/tm/tmview.cpp
+++ b/src/tm/tmview.cpp
@@ -703,7 +703,7 @@ CatalogString TM::targetAdapted(const TMEntry& entry, const \
CatalogString& ref)  DiffInfo d=getDiffInfo(diff);
 
     bool sameMarkup=Project::instance()->markup()==entry.markupExpr&&!entry.markupExpr.isEmpty();
                
-    bool tryMarkup=entry.target.tags.size() && sameMarkup;
+    bool tryMarkup=!entry.target.tags.size() && sameMarkup;
     //search for changed markup
     if (tryMarkup)
     {


[prev in list] [next in list] [prev in thread] [next in thread]