diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 900e23a..7043126 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -38,11 +38,11 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { closeSettings(); } }); - QObject::connect(device(), &Device::interactiveTimeout, [=]() { - if (main_layout->currentWidget() == settingsWindow) { - closeSettings(); - } - }); + // QObject::connect(device(), &Device::interactiveTimeout, [=]() { + // if (main_layout->currentWidget() == settingsWindow) { + // closeSettings(); + // } + // }); // load fonts QFontDatabase::addApplicationFont("../assets/fonts/Inter-Black.ttf"); @@ -93,11 +93,12 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { case QEvent::MouseMove: { // ignore events when device is awakened by resetInteractiveTimeout ignore = !device()->isAwake(); - if (main_layout->currentWidget() == settingsWindow) { - device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window - } else { + // if (main_layout->currentWidget() == settingsWindow) { + // Not working... + // device()->resetInteractiveTimeout(60 * 5); // 5 minute timeout if looking at settings window + // } else { device()->resetInteractiveTimeout(); // Default 30 seconds otherwise - } + // } break; } default: diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index fca3833..1f5fd07 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -459,9 +459,9 @@ void Device::setAwake(bool on) { } } -void Device::resetInteractiveTimeout(int timeout) { +void Device::resetInteractiveTimeout(int timeout = -1) { if (timeout == -1) { - timeout = 30; + timeout = 60; } interactive_timeout = timeout * UI_FREQ; }