PKGBUILDs/community/mgba/isnan.patch

39 lines
1.4 KiB
Diff
Raw Normal View History

2016-03-14 12:54:30 +00:00
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index ed6c5ed..f5916c5 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -48,11 +48,6 @@ extern "C" {
using namespace QGBA;
-#if defined(__WIN32) || defined(__OpenBSD__)
-// This is a macro everywhere except MinGW and OpenBSD, it seems
-using std::isnan;
-#endif
-
Window::Window(ConfigController* config, int playerId, QWidget* parent)
: QMainWindow(parent)
, m_log(0)
@@ -774,7 +769,7 @@ void Window::updateTitle(float fps) {
m_controller->threadContinue();
if (title.isNull()) {
setWindowTitle(tr("%1 - %2").arg(projectName).arg(projectVersion));
- } else if (isnan(fps)) {
+ } else if (fps < 0) {
setWindowTitle(tr("%1 - %2 - %3").arg(projectName).arg(title).arg(projectVersion));
} else {
setWindowTitle(tr("%1 - %2 (%3 fps) - %4").arg(projectName).arg(title).arg(fps).arg(projectVersion));
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 7d6ece7..5a244b9 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -142,7 +142,7 @@ private slots:
QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name);
- void updateTitle(float fps = NAN);
+ void updateTitle(float fps = -1);
GameController* m_controller;
Display* m_display;