Merge branch 'master'

LMMS · Sep 19, 2020 · d2039fb · d2039fb
2 parents 9680a80 + a6d0b46
commit d2039fb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -40,7 +40,9 @@
 #include <QTextStream>
 
 #ifdef LMMS_BUILD_WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif