diff --git a/acinclude.m4 b/acinclude.m4
index 07cb6f8a2..5e78efd5f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -104,8 +104,8 @@ if test "x$GCC" = "xyes"; then
     CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
 
     # use C++17 if possible (Qt 6 requires it)
-    AUD_CHECK_CXXFLAGS(-std=gnu++17)
-    if test "${CXXFLAGS%gnu++17}" = "$CXXFLAGS" ; then
+    AUD_CHECK_CXXFLAGS(-std=gnu++20)
+    if test "${CXXFLAGS%gnu++20}" = "$CXXFLAGS" ; then
         CXXFLAGS="$CXXFLAGS -std=gnu++11"
     fi
 
diff --git a/meson.build b/meson.build
index e4af229ce..b6383ae5a 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('audacious', 'c', 'cpp',
         meson_version: '>= 0.46',
         default_options: [
           'c_std=gnu99',
-          'cpp_std=gnu++17',
+          'cpp_std=gnu++20',
           'warning_level=1'
         ])
 
diff --git a/src/libaudgui/infowin.cc b/src/libaudgui/infowin.cc
index ccb3359d4..8bb402d37 100644
--- a/src/libaudgui/infowin.cc
+++ b/src/libaudgui/infowin.cc
@@ -516,7 +516,7 @@ static void infowin_show (Playlist list, int entry, const String & filename,
 EXPORT void audgui_infowin_show (Playlist playlist, int entry)
 {
     String filename = playlist.entry_filename (entry);
-    g_return_if_fail (filename != nullptr);
+    g_return_if_fail (filename);
 
     String error;
     PluginHandle * decoder = playlist.entry_decoder (entry, Playlist::Wait, & error);