Skip to content

Commit

Permalink
1.9.4
Browse files Browse the repository at this point in the history
・入力モードウィンドウの表示中に他のIMEに切り替えたとき異常終了するバグを修正しました。
  • Loading branch information
nathancorvussolis committed Sep 16, 2015
1 parent eded4fb commit c56be69
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# CorvusSKK ver. 1.9.3
# CorvusSKK ver. 1.9.4

Windowsで動作するSKK風のIMEです。

Expand Down
6 changes: 3 additions & 3 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define VERSION_H

#define TEXTSERVICE_NAME L"CorvusSKK"
#define TEXTSERVICE_VER L"1.9.3"
#define TEXTSERVICE_VER L"1.9.4"

#ifndef _DEBUG
#define TEXTSERVICE_DESC TEXTSERVICE_NAME
Expand All @@ -14,7 +14,7 @@
//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "1.9.3"
#define RC_VERSION_D 1,9,3,0
#define RC_VERSION "1.9.4"
#define RC_VERSION_D 1,9,4,0

#endif
4 changes: 2 additions & 2 deletions imcrvtip/Composition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void CTextService::_TerminateComposition(TfEditCookie ec, ITfContext *pContext)
return;
}

if(_pComposition != NULL)
if(_IsComposing())
{
_ClearCompositionDisplayAttributes(ec, pContext);
_pComposition->EndComposition(ec);
Expand Down Expand Up @@ -231,7 +231,7 @@ void CTextService::_ClearComposition()

_EndInputModeWindow();

if(_pComposition != NULL)
if(_IsComposing())
{
ITfDocumentMgr *pDocumentMgr;
if((_pThreadMgr->GetFocus(&pDocumentMgr) == S_OK) && (pDocumentMgr != NULL))
Expand Down
4 changes: 2 additions & 2 deletions imcrvtip/TextService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ STDAPI CTextService::Deactivate()

_SaveUserDic();

SafeRelease(&_pCandidateList);
_EndCandidateList();

SafeRelease(&_pInputModeWindow);
_EndInputModeWindow();

_UninitFunctionProvider();

Expand Down
4 changes: 2 additions & 2 deletions installer/README.TXT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

==============================================================================

CorvusSKK ver. 1.9.3
CorvusSKK ver. 1.9.4

https://nathancorvussolis.github.io/
[email protected]
Expand All @@ -23,6 +23,6 @@

マニュアル

https://github.com/nathancorvussolis/corvusskk/blob/1.9.3/README.md
https://github.com/nathancorvussolis/corvusskk/blob/1.9.4/README.md

==============================================================================
2 changes: 1 addition & 1 deletion installer/_version.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

set VERSION=1.9.3
set VERSION=1.9.4
2 changes: 1 addition & 1 deletion installer/corvusskk-x64.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.9.3" ?>
<?define version="1.9.4" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="DBDB315C-1F74-4051-8A67-705D0FD16497">
Expand Down
2 changes: 1 addition & 1 deletion installer/corvusskk-x86.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.9.3" ?>
<?define version="1.9.4" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="3F1244EC-9A5C-4041-9A33-E26B03C63C9B">
Expand Down

0 comments on commit c56be69

Please sign in to comment.