diff options
| author | nyamatongwe <unknown> | 2011-09-09 16:59:38 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-09-09 16:59:38 +1000 |
| commit | c4e2263b026a0b5aa67c421b767c3ebbabda654f (patch) | |
| tree | a81b91816ba7a5b16ad676ba3a2776e99a3316af /lexlib/SparseState.h | |
| parent | 9f1e13f587c8c3221a99cd2beee90242c32862fc (diff) | |
| parent | 9b4a855ed7962ce5da8c3e538a38f3eb396a8cc7 (diff) | |
| download | scintilla-mirror-c4e2263b026a0b5aa67c421b767c3ebbabda654f.tar.gz | |
Merge with main repository.
Diffstat (limited to 'lexlib/SparseState.h')
| -rw-r--r-- | lexlib/SparseState.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lexlib/SparseState.h b/lexlib/SparseState.h index 655d7429c..08ff104d3 100644 --- a/lexlib/SparseState.h +++ b/lexlib/SparseState.h @@ -92,7 +92,7 @@ public: changed = true; } typename stateVector::const_iterator startOther = other.states.begin(); - if (!states.empty() && states.back().value == startOther->value) + if (!states.empty() && !other.states.empty() && states.back().value == startOther->value) ++startOther; if (startOther != other.states.end()) { states.insert(states.end(), startOther, other.states.end()); |