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

Qt: Fix timezone issues with time overrides

This commit is contained in:
Vicki Pfau 2017-08-04 13:38:48 -07:00
parent 25a716b6a8
commit 206b01a2d1
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -15,6 +15,7 @@ Bugfixes:
- GB MBC: Fix RTC loading when file size is off - GB MBC: Fix RTC loading when file size is off
- GB Serialize: Fix deserializing video STAT - GB Serialize: Fix deserializing video STAT
- GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834) - GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834)
- Qt: Fix timezone issues with time overrides
Misc: Misc:
- Qt: Don't rebuild library view if style hasn't changed - Qt: Don't rebuild library view if style hasn't changed
- SDL: Fix 2.0.5 build on macOS under some circumstances - SDL: Fix 2.0.5 build on macOS under some circumstances

4
src/platform/qt/SensorView.cpp
View File

@ -28,10 +28,10 @@ SensorView::SensorView(GameController* controller, InputController* input, QWidg
connect(m_ui.timeNoOverride, &QAbstractButton::clicked, controller, &GameController::setRealTime); connect(m_ui.timeNoOverride, &QAbstractButton::clicked, controller, &GameController::setRealTime);
connect(m_ui.timeFixed, &QRadioButton::clicked, [controller, this] () { connect(m_ui.timeFixed, &QRadioButton::clicked, [controller, this] () {
controller->setFixedTime(m_ui.time->dateTime()); controller->setFixedTime(m_ui.time->dateTime().toUTC());
}); });
connect(m_ui.timeFakeEpoch, &QRadioButton::clicked, [controller, this] () { connect(m_ui.timeFakeEpoch, &QRadioButton::clicked, [controller, this] () {
controller->setFakeEpoch(m_ui.time->dateTime()); controller->setFakeEpoch(m_ui.time->dateTime().toUTC());
}); });
connect(m_ui.time, &QDateTimeEdit::dateTimeChanged, [controller, this] (const QDateTime&) { connect(m_ui.time, &QDateTimeEdit::dateTimeChanged, [controller, this] (const QDateTime&) {
m_ui.timeButtons->checkedButton()->clicked(); m_ui.timeButtons->checkedButton()->clicked();

3
src/platform/qt/SensorView.ui
View File

@ -96,9 +96,6 @@
<property name="displayFormat"> <property name="displayFormat">
<string>MM/dd/yy hh:mm:ss AP</string> <string>MM/dd/yy hh:mm:ss AP</string>
</property> </property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>