diff options
| author | Piotr Piastucki <leech.miranda@gmail.com> | 2015-05-17 11:02:00 +0000 |
|---|---|---|
| committer | Piotr Piastucki <leech.miranda@gmail.com> | 2015-05-17 11:02:00 +0000 |
| commit | db76af0b9b46bd89b685375e4c32b471d7f6713a (patch) | |
| tree | 8a9baf741e0172622540e431aef5c1e196b55090 /protocols/MSN/src/msn_opts.cpp | |
| parent | f4ee10f5adbfd29adbc90bb2df96a7fc279ef60e (diff) | |
- Forgot to save hotAuthToken which prevented login to Hotmail inbox after restart and relogin. You need to delete authTokenExpireTime in DB in order to get new token or wait 24h
- Cached netId in MyOptions for faster access
git-svn-id: http://svn.miranda-ng.org/main/trunk@13662 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/src/msn_opts.cpp')
| -rw-r--r-- | protocols/MSN/src/msn_opts.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 7f814dad6c..6b992dcb2f 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -662,18 +662,20 @@ INT_PTR CMsnProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam) void CMsnProto::LoadOptions(void)
{
- int bNoWlid;
memset(&MyOptions, 0, sizeof(MyOptions));
//Popup Options
MyOptions.ManageServer = getByte("ManageServer", TRUE) != 0;
MyOptions.ShowErrorsAsPopups = getByte("ShowErrorsAsPopups", TRUE) != 0;
MyOptions.SlowSend = getByte("SlowSend", FALSE) != 0;
- if ((bNoWlid=db_get_static(NULL, m_szModuleName, "wlid", MyOptions.szEmail, sizeof(MyOptions.szEmail))) &&
- db_get_static(NULL, m_szModuleName, "e-mail", MyOptions.szEmail, sizeof(MyOptions.szEmail)))
- MyOptions.szEmail[0] = 0;
- else if (bNoWlid) setString("wlid", MyOptions.szEmail);
+ if (db_get_static(NULL, m_szModuleName, "wlid", MyOptions.szEmail, sizeof(MyOptions.szEmail)))
+ {
+ if (db_get_static(NULL, m_szModuleName, "e-mail", MyOptions.szEmail, sizeof(MyOptions.szEmail)))
+ MyOptions.szEmail[0] = 0;
+ else setString("wlid", MyOptions.szEmail);
+ }
_strlwr(MyOptions.szEmail);
+ MyOptions.netId = getDword("netId", GetMyNetID());
if (db_get_static(NULL, m_szModuleName, "MachineGuid", MyOptions.szMachineGuid, sizeof(MyOptions.szMachineGuid))) {
char* uuid = getNewUuid();
|