From b1bd4d132f9a0fa4fb14f5a48a3adbc3c7e692e3 Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985@gmail.com>
Date: Fri, 6 Feb 2015 00:45:36 +0100
Subject: [PATCH] Merged in hotfix (pull request #108)

Merge hotfix branch.
---
 code/CMakeLists.txt                 | 1 +
 code/studio/src/settings_dialog.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 500331c43..dcc9f9c93 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -237,6 +237,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/")
 SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore")
+SET(CPACK_SET_DESTDIR TRUE)
 
 # NSIS Specific Packing Setup
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore")
diff --git a/code/studio/src/settings_dialog.cpp b/code/studio/src/settings_dialog.cpp
index 78773a666..df2718b9b 100644
--- a/code/studio/src/settings_dialog.cpp
+++ b/code/studio/src/settings_dialog.cpp
@@ -170,7 +170,8 @@ void SettingsDialog::onPrimitivesBClicked()
 
 void SettingsDialog::onLigoBClicked()
 {
-	QString p = QFileDialog::getExistingDirectory( this, tr( "LIGO directory" ), "" );
+    QString p;
+    p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" );
 	ligoLE->setText( p );
 }