From: <ibr...@us...> - 2013-08-04 00:53:35
|
Revision: 4698 http://sourceforge.net/p/tora/code/4698 Author: ibre5041 Date: 2013-08-04 00:53:31 +0000 (Sun, 04 Aug 2013) Log Message: ----------- Segfault fix. Modified Paths: -------------- branches/tora3/src/editor/tohighlightedtext.cpp branches/tora3/src/editor/tomarkedtext.cpp Modified: branches/tora3/src/editor/tohighlightedtext.cpp =================================================================== --- branches/tora3/src/editor/tohighlightedtext.cpp 2013-08-03 23:08:36 UTC (rev 4697) +++ branches/tora3/src/editor/tohighlightedtext.cpp 2013-08-04 00:53:31 UTC (rev 4698) @@ -86,8 +86,6 @@ } } - setHighlighter(highlighterType); - // Setup QsciScintilla stuff QsciScintilla::setFolding(QsciScintilla::BoxedFoldStyle); // enable syntax coloring if "Syntax highlighting" is on in editor preferences @@ -152,6 +150,7 @@ this, SLOT(setHighlighter(int))); thread->start(); + setHighlighter(highlighterType); scheduleParsing(); } Modified: branches/tora3/src/editor/tomarkedtext.cpp =================================================================== --- branches/tora3/src/editor/tomarkedtext.cpp 2013-08-03 23:08:36 UTC (rev 4697) +++ branches/tora3/src/editor/tomarkedtext.cpp 2013-08-04 00:53:31 UTC (rev 4698) @@ -91,7 +91,7 @@ #endif // it allows to use S&R in eg. error message output - QShortcut *searchReplaceShortcut = new QShortcut(QKeySequence::Find, parent, SLOT(searchReplace()), SLOT(searchReplace())); + //QShortcut *searchReplaceShortcut = new QShortcut(QKeySequence::Find, parent, SLOT(searchReplace()), SLOT(searchReplace())); // search all occurrences // allow indicator painting *under* the text (but it makes editor slower a bit...) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |