From 048b088b9de5dcb4645a5c153f79162d91a4b550 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Mon, 14 Sep 2015 09:58:07 +0200
Subject: [PATCH] Workaround to iter_forward_to_context_class_toggle bug.

---
 src/source.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/source.cc b/src/source.cc
index f985777..2ec6c01 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -232,8 +232,11 @@ Source::View::View(const boost::filesystem::path &file_path, Glib::RefPtr<Gsv::L
         while(iter!=get_buffer()->end()) {
           auto iter1=iter;
           auto iter2=iter;
-          get_source_buffer()->iter_forward_to_context_class_toggle(iter1, "string");
-          get_source_buffer()->iter_forward_to_context_class_toggle(iter2, "comment");
+          if(!get_source_buffer()->iter_forward_to_context_class_toggle(iter1, "string"))
+            iter1=get_buffer()->end();
+          if(!get_source_buffer()->iter_forward_to_context_class_toggle(iter2, "comment"))
+            iter2=get_buffer()->end();
+          
           if(iter2<iter1)
             iter=iter2;
           else