Disable complement with empty string

nathancorvussolis · Nov 2, 2016 · 177b57d · 177b57d
1 parent cf2c62b
commit 177b57d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/imcrvtip/KeyHandler.cpp b/imcrvtip/KeyHandler.cpp
@@ -523,16 +523,17 @@ void CTextService::_ResetStatus()
 	purgedicmode = FALSE;
 	hintmode = FALSE;
 
+	roman.clear();
+	kana.clear();
+	okuriidx = 0;
+
 	searchkey.clear();
 	searchkeyorg.clear();
 
 	candidates.clear();
 	candidates.shrink_to_fit();
 	candidx = 0;
-
-	roman.clear();
-	kana.clear();
-	okuriidx = 0;
+	candorgcnt = 0;
 
 	cursoridx = 0;
 }

diff --git a/imcrvtip/KeyHandlerConv.cpp b/imcrvtip/KeyHandlerConv.cpp
@@ -495,7 +495,7 @@ void CTextService::_NextComp()
 {
 	if(!complement)
 	{
-		if(okuriidx != 0)
+		if(kana.empty() || okuriidx != 0)
 		{
 			return;
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -495,7 +495,7 @@ void CTextService::_NextComp() @@
     {
     	if(!complement)
     	{
-    		if(okuriidx != 0)
+    		if(kana.empty() || okuriidx != 0)
     		{
     			return;
     		}
@@ Expand Down @@