Add cancel button to password change menu. (#5720)

[oweals/minetest.git] / src / clientenvironment.cpp

diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index cc75fd2d639fde2c8a297b0f015d8eb8c7d241a7..47df49b845dee3b13a134e6d604b857609633e40 100644 (file)
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "raycast.h"
 #include "voxelalgorithms.h"
 #include "settings.h"
+#include <algorithm>
 
 /*
        ClientEnvironment
@@ -598,15 +599,13 @@ void ClientEnvironment::getActiveObjects(v3f origin, f32 max_d,
        }
 }
 
-ClientEnvEvent ClientEnvironment::getClientEvent()
+ClientEnvEvent ClientEnvironment::getClientEnvEvent()
 {
-       ClientEnvEvent event;
-       if(m_client_event_queue.empty())
-               event.type = CEE_NONE;
-       else {
-               event = m_client_event_queue.front();
-               m_client_event_queue.pop();
-       }
+       FATAL_ERROR_IF(m_client_event_queue.empty(),
+                       "ClientEnvironment::getClientEnvEvent(): queue is empty");
+
+       ClientEnvEvent event = m_client_event_queue.front();
+       m_client_event_queue.pop();
        return event;
 }