all repos — mgba @ ffa7e9b8d2bd4a7f30d15bdd4f2f5e14ab6f2787

mGBA Game Boy Advance Emulator

Qt: Fix timezone issues with time overrides
Vicki Pfau vi@endrift.com
Fri, 04 Aug 2017 13:38:48 -0700
commit

ffa7e9b8d2bd4a7f30d15bdd4f2f5e14ab6f2787

parent

c030fb656f69206dda86468549290ba679d37cdc

3 files changed, 3 insertions(+), 5 deletions(-)

jump to
M CHANGESCHANGES

@@ -26,6 +26,7 @@ - GB MBC: Fix RTC loading when file size is off

- GB Serialize: Fix deserializing video STAT - Qt: Fix GL display when loading a game from CLI (fixes mgba.io/i/843) - GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834) + - Qt: Fix timezone issues with time overrides Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
M src/platform/qt/SensorView.cppsrc/platform/qt/SensorView.cpp

@@ -63,10 +63,10 @@ void SensorView::setController(std::shared_ptr<CoreController> controller) {

m_controller = controller; connect(m_ui.timeNoOverride, &QAbstractButton::clicked, controller.get(), &CoreController::setRealTime); 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] () { - controller->setFakeEpoch(m_ui.time->dateTime()); + controller->setFakeEpoch(m_ui.time->dateTime().toUTC()); }); m_ui.timeButtons->checkedButton()->clicked();
M src/platform/qt/SensorView.uisrc/platform/qt/SensorView.ui

@@ -96,9 +96,6 @@ </property>

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