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

Merge pull request #433 from dubslow/master

Browse Source 
fix #431, fix export cancels, and more debug prints
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-14 13:36:57 +02:00
commit f2f572273c
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qTox.desktop
View File

@ -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;

11
src/core.cpp
View File

@ -46,6 +46,8 @@ QList<ToxFile> 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;
@ -583,7 +585,7 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
uint64_t resumePos = *reinterpret_cast<const uint64_t*>(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
@ -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();

1
src/widget/camera.cpp
View File

@ -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);

5
src/widget/form/settings/identityform.cpp
View File

@ -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);