diff options
| -rw-r--r-- | main.cpp | 4 | ||||
| -rw-r--r-- | utilities.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -82,7 +82,6 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM {
string out;
DWORD code;
-// iRow = ListView_InsertItem(hwndList, &item);
string::size_type p = 0, p2 = 0, stop = 0;
{
TCHAR cmd[512];
@@ -91,8 +90,9 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM }
while(p != string::npos)
{
- if((p = out.find("sec ", p) + 5) == string::npos)
+ if((p = out.find("sec ", p)) == string::npos)
break;
+ p += 5;
if(p < stop)
break;
stop = p;
diff --git a/utilities.cpp b/utilities.cpp index e4a63c9..8fba235 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -202,8 +202,8 @@ int ToggleEncryption(WPARAM w, LPARAM l) {
HANDLE hContact = (HANDLE)w;
BYTE enc = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
- enc?DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 0):DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 1);
- enc?enc = 0:enc = 1;
+ DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", enc?0:1);
+ enc = enc?0:1;
CLISTMENUITEM mi = {0};
mi.cbSize=sizeof(mi);
mi.flags = CMIM_NAME;
@@ -218,7 +218,7 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l) CLISTMENUITEM mi = {0};
mi.cbSize=sizeof(mi);
mi.flags = CMIM_NAME;
- DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)?mi.pszName="Turn on GPG encryption":mi.pszName="Turn off GPG encryption";
+ mi.pszName = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)?"Turn off GPG encryption":"Turn on GPG encryption";
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
return 0;
}
|