StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

read tox_save if no data; if no profiles, no popup

Browse Source
This commit is contained in:
dubslow 2014-10-10 17:07:18 -05:00
parent a99e7d2b94
commit 6ab90d4516
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core.cpp
View File

@ -213,14 +213,17 @@ void Core::start()
qsrand(time(nullptr));
if (!loadConfiguration(loadPath)) // loadPath is meaningless after this
{
emit failedToStart();
tox_kill(tox);
tox = nullptr;
return;
if (loadPath != "")
{
if (!loadConfiguration(loadPath)) // loadPath is meaningless after this
{
emit failedToStart();
tox_kill(tox);
tox = nullptr;
return;
}
loadPath = "";
}
loadPath = "";
tox_callback_friend_request(tox, onFriendRequest, this);
tox_callback_friend_message(tox, onFriendMessage, this);

13
widget/widget.cpp
View File

@ -230,9 +230,17 @@ QString Widget::detectProfile()
QFile file(path);
if (file.exists())
return path;
else if (QFile(path = dir.filePath("tox_save")).exists()) // also import tox_save if no data
return path;
else
#endif
return dir.filePath(askProfiles() + Core::TOX_EXT);
{
profile = askProfiles();
if (profile != "")
return dir.filePath(profile + Core::TOX_EXT);
else
return "";
}
}
else
return path;
@ -250,8 +258,9 @@ QList<QString> Widget::searchProfiles()
}
QString Widget::askProfiles()
{
{ // TODO: allow user to create new Tox ID, even if a profile already exists
QList<QString> profiles = searchProfiles();
if (profiles.empty()) return "";
bool ok;
QString profile = QInputDialog::getItem(this,
tr("Choose a profile"),