From ea5edd205243b07c838bd67c3808feb82b36331f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 26 Oct 2017 12:59:35 +0200
Subject: [vmware] Update to 14.0.0

---
 core/modules/vmware/data/opt/openslx/bin/vmplayer           | 13 ++++++-------
 .../vmchooser/plugins/vmware/includes/write_final_vmx.inc   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'core/modules/vmware/data/opt')

diff --git a/core/modules/vmware/data/opt/openslx/bin/vmplayer b/core/modules/vmware/data/opt/openslx/bin/vmplayer
index cfb91a0a..05a4ec3a 100755
--- a/core/modules/vmware/data/opt/openslx/bin/vmplayer
+++ b/core/modules/vmware/data/opt/openslx/bin/vmplayer
@@ -5,13 +5,12 @@ PREFIX=/usr/lib/vmware # depends on the vmware location
 # HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled
 export force_s3tc_enable=true
 
-PROG=$(basename $0)
-
-exec "$PREFIX/lib/wrapper-gtk24.sh" \
-     "$PREFIX/lib" \
-     "$PREFIX/bin/$PROG" \
-     "$PREFIX/libconf" "$@"
-
+# Turn off "helpful" DE features
+export APPMENU_DISPLAY_BOTH=1
+export UBUNTU_MENUPROXY=0
+export GNOME_DISABLE_CRASH_DIALOG=1
 
+PROG=$(basename $0)
 
+exec "$PREFIX/bin/$PROG" "$@"
 
diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
index 84ddee1d..a431560f 100644
--- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
+++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
@@ -50,8 +50,8 @@ setup_floppies() {
 
 	# Floppies:
 	cat >> "${TMPCONFIG}" <<-HEREEND
-	floppy0.present = "$FLOPPY0"
-	floppy0.startConnected = "FALSE"
+	floppy0.present = "TRUE"
+	floppy0.startConnected = "$FLOPPY0"
 	floppy0.autodetect = "TRUE"
 	floppy0.fileName = "auto detect"
 	floppy1.present = "$SLX_FLOPPY"
-- 
cgit v1.2.3-55-g7522