ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Ensure camera image is valid

This commit is contained in:
Vicki Pfau 2018-10-01 12:07:56 -07:00
parent 2bfc3e0ca6
commit 2d5bfe3321
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -120,6 +120,7 @@ Misc:
- Wii: Define _GNU_SOURCE (fixes mgba.io/i/1106) - Wii: Define _GNU_SOURCE (fixes mgba.io/i/1106)
- Wii: Expose stretch configuration in settings - Wii: Expose stretch configuration in settings
- Wii: Stretch now sets pixel-accurate mode size cap - Wii: Stretch now sets pixel-accurate mode size cap
- Qt: Ensure camera image is valid
0.7 beta 1: (2018-09-24) 0.7 beta 1: (2018-09-24)
- Initial beta for 0.7 - Initial beta for 0.7

8
src/platform/qt/InputController.cpp
View File

@ -678,13 +678,13 @@ void InputController::releaseFocus(QWidget* focus) {
} }
void InputController::loadCamImage(const QString& path) { void InputController::loadCamImage(const QString& path) {
QMutexLocker locker(&m_image.mutex); setCamImage(QImage(path));
m_image.image.load(path);
m_image.resizedImage = QImage();
m_image.outOfDate = true;
} }
void InputController::setCamImage(const QImage& image) { void InputController::setCamImage(const QImage& image) {
if (image.isNull()) {
return;
}
QMutexLocker locker(&m_image.mutex); QMutexLocker locker(&m_image.mutex);
m_image.image = image; m_image.image = image;
m_image.resizedImage = QImage(); m_image.resizedImage = QImage();