From dc7d14e9bec31f5ba10198e024fafe8636d1f852 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 27 Sep 2015 09:37:22 +0000 Subject: Tox: - crash fix (fixes #1056) git-svn-id: http://svn.miranda-ng.org/main/trunk@15457 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/src/tox_core.cpp | 19 ++++++++++--------- protocols/Tox/src/tox_options.cpp | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'protocols') diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index 25e35c84dd..335743303b 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -119,17 +119,18 @@ bool CToxProto::InitToxCore() void CToxProto::UninitToxCore() { - if (toxThread->toxAv) - toxav_kill(toxThread->toxAv); + if (toxThread) { + if (toxThread->toxAv) + toxav_kill(toxThread->toxAv); - if (toxThread->tox) - { - CancelAllTransfers(); + if (toxThread->tox) + { + CancelAllTransfers(); - SaveToxProfile(); + SaveToxProfile(); - tox_kill(toxThread->tox); + tox_kill(toxThread->tox); + } + toxThread = NULL; } - - toxThread = NULL; } \ No newline at end of file diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 1954ecc147..fdd5d30a92 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -86,7 +86,7 @@ void CToxOptionsMain::ProfileCreate_OnClick(CCtrlButton*) if (m_proto->InitToxCore()) { - TCHAR *group = m_group.GetText(); + ptrT group(m_group.GetText()); if (mir_tstrlen(group) > 0 && Clist_GroupExists(group)) Clist_CreateGroup(0, group); @@ -155,8 +155,8 @@ void CToxOptionsMain::ProfileExport_OnClick(CCtrlButton*) ofn.lpstrFilter = filter; ofn.nFilterIndex = 0; ofn.lpstrFile = profilePath; - ofn.lpstrTitle = TranslateT("Save Tox profile"); \ - ofn.nMaxFile = MAX_PATH; + ofn.lpstrTitle = TranslateT("Save Tox profile"); + ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_EXPLORER; ofn.lpstrInitialDir = _T("%HOMEPATH%"); -- cgit v1.2.3