From 2379918a3ee67a7b59d6d98ee1c85c1ed3ef21dd Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 16 Oct 2016 17:39:37 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/macosx/upgd_nl.sh           | 36 +++++++------------
 code/ryzom/client/src/init_main_loop.cpp      |  7 ++++
 code/ryzom/client/unix/upgd_nl.sh             |  2 +-
 .../tools/client/ryzom_installer/src/main.cpp |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/code/ryzom/client/macosx/upgd_nl.sh b/code/ryzom/client/macosx/upgd_nl.sh
index c0da04a5a..d9ff9973d 100755
--- a/code/ryzom/client/macosx/upgd_nl.sh
+++ b/code/ryzom/client/macosx/upgd_nl.sh
@@ -12,33 +12,21 @@ MACOSPATH=$(dirname "$RYZOM_CLIENT")
 SIGNPATH=$CONTENTSPATH/_CodeSignature
 
 # all files of original Bundle are in the same directory
-# we have to copy them to the right location
+# we have to uncompress them to the right location
 
 # client_default.cfg and ryzom.icns are already in the right location
 
-# PkgInfo usually doesn't change so don't copy it
+# uncompress Ryzom
+if [ -e "$ROOTPATH/Ryzom.zip" ]
+then
+  unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/.."
+fi
 
-# Info.plist contains updated version
-cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
-
-cp -p "$ROOTPATH/CodeResources" "$SIGNPATH"
-
-# executable flag for all executables
-chmod +x "$ROOTPATH/Ryzom"
-chmod +x "$ROOTPATH/CrashReport"
-chmod +x "$ROOTPATH/RyzomClientPatcher"
-chmod +x "$ROOTPATH/RyzomConfiguration"
-
-# remove previous executables
-rm -f "$MACOSPATH/Ryzom"
-rm -f "$MACOSPATH/CrashReport"
-rm -f "$MACOSPATH/RyzomClientPatcher"
-rm -f "$MACOSPATH/RyzomConfiguration"
-
-# copy all binaries in MacOS directory
-cp -p "$ROOTPATH/Ryzom" "$MACOSPATH"
-cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
-cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH"
-cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH"
+# only uncompress Ryzom Installer if found in parent directory
+if [ -e "$ROOTPATH/RyzomInstaller.zip" ] && [ -d "$CONTENTSPATH/../../Ryzom Installer.app" ]
+then
+  rm -rf "$CONTENTSPATH/../../Ryzom Installer.app"
+  unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../.."
+fi
 
 exit 0
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index a61e42f8c..8e2c88c69 100644
--- a/code/ryzom/client/src/init_main_loop.cpp
+++ b/code/ryzom/client/src/init_main_loop.cpp
@@ -1619,6 +1619,7 @@ void initBloomConfigUI()
 	bool supportBloom = Driver->supportBloomEffect();
 
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+
 	CCtrlBaseButton* button = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:game_config:content:fx:bloom_gr:bloom:c"));
 	if(button)
 	{
@@ -1631,6 +1632,12 @@ void initBloomConfigUI()
 		button->setFrozen(!supportBloom);
 	}
 
+	button = dynamic_cast<CCtrlBaseButton*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:game_config:content:fx:fxaa:c"));
+	if (button)
+	{
+		button->setFrozen(!supportBloom);
+	}
+
 	CCtrlScroll * scroll = dynamic_cast<CCtrlScroll*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:game_config:content:fx:bloom_gr:density_bloom:c"));
 	if(scroll)
 	{
diff --git a/code/ryzom/client/unix/upgd_nl.sh b/code/ryzom/client/unix/upgd_nl.sh
index 1b4ba0176..4265f1b26 100755
--- a/code/ryzom/client/unix/upgd_nl.sh
+++ b/code/ryzom/client/unix/upgd_nl.sh
@@ -16,7 +16,7 @@ chmod +x "$ROOTPATH/ryzom_installer_qt"
 # copy Ryzom Installer if present in parent directory
 if [ -e "$ROOTPATH/../ryzom_installer_qt" ]
 then
-	rm -f "$ROOTPATH/../ryzom_installer_qt"
+  rm -f "$ROOTPATH/../ryzom_installer_qt"
   cp -a "$ROOTPATH/ryzom_installer_qt" "$ROOTPATH/.."
 fi
 
diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp
index 23b602284..9b587c0b2 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp
@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
 		{
 #ifndef _DEBUG
 			// restart more recent installed Installer version
-			if (QProcess::startDetached(config.getInstallerOriginalFilePath(), QApplication::arguments())) return 0;
+			if (QProcess::startDetached(config.getInstallerInstalledFilePath(), QApplication::arguments())) return 0;
 #endif
 		}
 		else if (step == Done)