summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-01-16 15:14:20 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-01-16 15:14:20 (GMT)
commitcacd6f5cc3754872653311d5333145f2256079d9 (patch)
treee4258b40a8ea33e94e5d6183b1f439a795a7b37c /Swift/Controllers/HighlightManager.cpp
parentc4f8b7b06d038473a377c88d0dee54b69f67c77a (diff)
downloadswift-cacd6f5cc3754872653311d5333145f2256079d9.zip
swift-cacd6f5cc3754872653311d5333145f2256079d9.tar.bz2
Updated highlight dialog.
Change-Id: I9bf91fdbf542e01a9f2421315698846ca0bdb043
Diffstat (limited to 'Swift/Controllers/HighlightManager.cpp')
-rw-r--r--Swift/Controllers/HighlightManager.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/Swift/Controllers/HighlightManager.cpp b/Swift/Controllers/HighlightManager.cpp
index 46af389..17ce776 100644
--- a/Swift/Controllers/HighlightManager.cpp
+++ b/Swift/Controllers/HighlightManager.cpp
@@ -125,12 +125,7 @@ void HighlightManager::storeSettings()
void HighlightManager::loadSettings()
{
std::string highlightRules = settings_->getSetting(SettingConstants::HIGHLIGHT_RULES);
- std::vector<HighlightRule> rules = rulesFromString(highlightRules);
- if (rules.empty()) {
- rules_ = getDefaultRules();
- } else {
- rules_ = rules;
- }
+ rules_ = rulesFromString(highlightRules);
}
Highlighter* HighlightManager::createHighlighter()