From 68de3667385e44c864a857a48155a831dae5141e Mon Sep 17 00:00:00 2001 From: dubslow Date: Mon, 13 Oct 2014 16:17:42 -0500 Subject: [PATCH 1/4] fix #431, fix export cancels, and more debug prints --- src/core.cpp | 9 +++++++++ src/widget/form/settings/identityform.cpp | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/core.cpp b/src/core.cpp index efaa68e7f..824085de6 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -46,6 +46,8 @@ QList Core::fileRecvQueue; Core::Core(Camera* cam, QThread *coreThread, QString loadPath) : tox(nullptr), camera(cam), loadPath(loadPath) { + qDebug() << "Core: loading Tox from" << loadPath; + videobuf = new uint8_t[videobufsize]; videoBusyness=0; @@ -1184,6 +1186,13 @@ void Core::saveConfiguration(const QString& path) void Core::switchConfiguration(QString profile) { + if (profile.isEmpty()) + { + qWarning() << "Core: got null profile to switch to, not switching"; + return; + } + else + qDebug() << "Core: switching from" << Settings::getInstance().getCurrentProfile() << "to" << profile; saveConfiguration(); toxTimer->stop(); diff --git a/src/widget/form/settings/identityform.cpp b/src/widget/form/settings/identityform.cpp index c0853f958..1c16e6b8b 100644 --- a/src/widget/form/settings/identityform.cpp +++ b/src/widget/form/settings/identityform.cpp @@ -132,7 +132,8 @@ void IdentityForm::onExportClicked() QString path = QFileDialog::getSaveFileName(this, tr("Export profile", "save dialog title"), QDir::home().filePath(current), tr("Tox save file (*.tox)", "save dialog filter")); - QFile::copy(QDir(Settings::getSettingsDirPath()).filePath(current), path); + if (!path.isEmpty()) + QFile::copy(QDir(Settings::getSettingsDirPath()).filePath(current), path); } void IdentityForm::onDeleteClicked() @@ -157,6 +158,8 @@ void IdentityForm::onDeleteClicked() void IdentityForm::onImportClicked() { QString path = QFileDialog::getOpenFileName(this, tr("Import profile", "import dialog title"), QDir::homePath(), tr("Tox save file (*.tox)", "import dialog filter")); + if (path.isEmpty()) + return; QFileInfo info(path); QString profile = info.completeBaseName(); QString profilePath = QDir(Settings::getSettingsDirPath()).filePath(profile + Core::TOX_EXT); From cbf8d610c84aa2d963860dcaafab3b2f77c03348 Mon Sep 17 00:00:00 2001 From: krepa098 Date: Sat, 11 Oct 2014 20:23:31 +0200 Subject: [PATCH 2/4] fixed #425 --- src/widget/camera.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/widget/camera.cpp b/src/widget/camera.cpp index 5bf07e6df..b652d7033 100644 --- a/src/widget/camera.cpp +++ b/src/widget/camera.cpp @@ -34,7 +34,6 @@ Camera::Camera() connect(workerThread, &QThread::started, worker, &CameraWorker::onStart); connect(workerThread, &QThread::finished, worker, &CameraWorker::deleteLater); - connect(workerThread, &QThread::deleteLater, worker, &CameraWorker::deleteLater); connect(worker, &CameraWorker::started, this, &Camera::onWorkerStarted); connect(worker, &CameraWorker::newFrameAvailable, this, &Camera::onNewFrameAvailable); connect(worker, &CameraWorker::resProbingFinished, this, &Camera::onResProbingFinished); From 3b32727d9e91124d14d3e9a783294da294e82a79 Mon Sep 17 00:00:00 2001 From: dubslow Date: Mon, 13 Oct 2014 17:45:52 -0500 Subject: [PATCH 3/4] We handle .tox files (still need actual command line support) --- qTox.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qTox.desktop b/qTox.desktop index afd74b440..298a11771 100644 --- a/qTox.desktop +++ b/qTox.desktop @@ -9,4 +9,4 @@ Exec=qtox Icon=qtox Categories=InstantMessaging;;AudioVideo;Network; Terminal=false -MimeType=x-scheme-handler/tox; +MimeType=x-scheme-handler/tox;application/x-tox; From 48faffaa3e2c546eb4803f3701e3979991c82ec0 Mon Sep 17 00:00:00 2001 From: dubslow Date: Mon, 13 Oct 2014 19:27:24 -0500 Subject: [PATCH 4/4] fix compile warning, they are fatal to Qt Creator --- src/core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.cpp b/src/core.cpp index 824085de6..614184242 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -585,7 +585,7 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive uint64_t resumePos = *reinterpret_cast(data); - if (resumePos >= file->filesize) + if (resumePos >= (unsigned)file->filesize) { qWarning() << "Core::onFileControlCallback: invalid resume position"; tox_file_send_control(tox, file->friendId, 0, file->fileNum, TOX_FILECONTROL_KILL, nullptr, 0); // don't sure about it