4 files changed, 17 insertions, 5 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 3648f6f37a..cc512263bc 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -123,6 +123,7 @@ void OS_Android::set_opengl_extensions(const char *p_gl_extensions) {
 	ERR_FAIL_COND(!p_gl_extensions);
 	gl_extensions = p_gl_extensions;
 }
+
 int OS_Android::get_current_video_driver() const {
 	return video_driver_index;
 }
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
index 098ad632cf..a4538a6673 100644
--- a/platform/iphone/os_iphone.cpp
+++ b/platform/iphone/os_iphone.cpp
@@ -99,7 +99,7 @@ int OSIPhone::get_current_video_driver() const {
 
 Error OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
 
-	video_driver = p_video_driver; //this may be misleading
+	video_driver_index = p_video_driver; //this may be misleading
 
 	RasterizerGLES3::register_config();
 	RasterizerGLES3::make_current();
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 3b1be780d4..1c17780ad7 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -28,16 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "os_server.h"
+
 #include "drivers/dummy/audio_driver_dummy.h"
 #include "drivers/dummy/rasterizer_dummy.h"
 #include "drivers/dummy/texture_loader_dummy.h"
 #include "print_string.h"
 #include "servers/visual/visual_server_raster.h"
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "main/main.h"
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int OS_Server::get_video_driver_count() const {
@@ -58,6 +59,10 @@ const char *OS_Server::get_audio_driver_name(int p_driver) const {
 	return "Dummy";
 }
 
+int OS_Server::get_current_video_driver() const {
+	return video_driver_index;
+}
+
 void OS_Server::initialize_core() {
 
 	crash_handler.initialize();
@@ -73,6 +78,8 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int
 
 	RasterizerDummy::make_current();
 
+	video_driver_index = p_video_driver; // unused in server platform, but should still be initialized
+
 	visual_server = memnew(VisualServerRaster);
 	visual_server->init();
 
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index f1a880ecc2..8c47bfc591 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -30,12 +30,12 @@
 #ifndef OS_SERVER_H
 #define OS_SERVER_H
 
-#include "../x11/crash_handler_x11.h"
-#include "../x11/power_x11.h"
 #include "drivers/dummy/texture_loader_dummy.h"
 #include "drivers/rtaudio/audio_driver_rtaudio.h"
 #include "drivers/unix/os_unix.h"
 #include "main/input_default.h"
+#include "platform/x11/crash_handler_x11.h"
+#include "platform/x11/power_x11.h"
 #include "servers/audio_server.h"
 #include "servers/visual/rasterizer.h"
 #include "servers/visual_server.h"
@@ -66,6 +66,8 @@ class OS_Server : public OS_Unix {
 
 	CrashHandler crash_handler;
 
+	int video_driver_index;
+
 	ResourceFormatDummyTexture *resource_loader_dummy;
 
 protected:
@@ -84,6 +86,8 @@ protected:
 public:
 	virtual String get_name();
 
+	virtual int get_current_video_driver() const;
+
 	virtual void set_cursor_shape(CursorShape p_shape);
 	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);