1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #3444

Diadlo (1):
      fix(chatform, screenshotgrabber): Fixed memory leak
This commit is contained in:
sudden6 2016-06-30 13:49:45 +02:00
commit d408cb5184
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
3 changed files with 23 additions and 8 deletions

View File

@ -67,7 +67,8 @@
ChatForm::ChatForm(Friend* chatFriend)
: f(chatFriend)
, isTyping{false}
, screenshotGrabber(nullptr)
, isTyping(false)
{
Core* core = Core::getInstance();
coreav = core->getAv();
@ -208,7 +209,7 @@ void ChatForm::onAttachClicked()
file.close();
continue;
}
long long filesize = file.size();
qint64 filesize = file.size();
file.close();
QFileInfo fi(path);
@ -783,9 +784,14 @@ void ChatForm::onScreenshotClicked()
void ChatForm::doScreenshot()
{
ScreenshotGrabber* screenshotGrabber = new ScreenshotGrabber(this);
connect(screenshotGrabber, &ScreenshotGrabber::screenshotTaken, this, &ChatForm::onScreenshotTaken);
if (!screenshotGrabber)
screenshotGrabber = new ScreenshotGrabber(this);
connect(screenshotGrabber, &ScreenshotGrabber::screenshotTaken,
this, &ChatForm::onScreenshotTaken);
screenshotGrabber->showGrabber();
// Create dir for screenshots
QDir(Settings::getInstance().getAppDataDirPath()).mkpath("screenshots");
}
@ -807,16 +813,21 @@ void ChatForm::onScreenshotTaken(const QPixmap &pixmap) {
QMessageBox::warning(this,
tr("Failed to open temporary file", "Temporary file for screenshot"),
tr("qTox wasn't able to save the screenshot"));
delete screenshotGrabber;
screenshotGrabber = nullptr;
return;
}
pixmap.save(&file, "PNG");
long long filesize = file.size();
qint64 filesize = file.size();
file.close();
QFileInfo fi(file);
emit sendFile(f->getFriendID(), fi.fileName(), fi.filePath(), filesize);
delete screenshotGrabber;
screenshotGrabber = nullptr;
}
void ChatForm::onLoadHistory()

View File

@ -20,13 +20,15 @@
#ifndef CHATFORM_H
#define CHATFORM_H
#include "genericchatform.h"
#include "src/core/corestructs.h"
#include <QSet>
#include <QLabel>
#include <QTimer>
#include <QElapsedTimer>
#include "genericchatform.h"
#include "src/core/corestructs.h"
#include "src/widget/tool/screenshotgrabber.h"
class Friend;
class FileTransferInstance;
class QPixmap;
@ -112,6 +114,7 @@ private:
QAction* loadHistoryAction;
QAction* copyStatusAction;
ScreenshotGrabber* screenshotGrabber;
QHash<uint, FileTransferInstance*> ftransWidgets;
void startCounter();
void stopCounter();

View File

@ -132,9 +132,10 @@ void ScreenshotGrabber::acceptRegion()
return;
qDebug() << "Screenshot accepted, chosen region" << rect;
emit screenshotTaken(this->screenGrab.copy(rect));
QPixmap pixmap = this->screenGrab.copy(rect);
this->window->close();
restoreHiddenWindows();
emit screenshotTaken(pixmap);
}
void ScreenshotGrabber::setupScene()