From 26bc0d1b72817fd5120ea6ba56797e68f42c685e Mon Sep 17 00:00:00 2001
From: Simon Detheridge <simon@highlyillogical.org>
Date: Fri, 24 Jul 2015 11:10:18 +0100
Subject: [PATCH] Look for flam3-palettes.xml in executable dir, not working
 dir

---
 Source/Fractorium/FractoriumEmberController.cpp | 6 ++++--
 Source/Fractorium/FractoriumPalette.cpp         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp
index a7f0e55..4bf91cb 100644
--- a/Source/Fractorium/FractoriumEmberController.cpp
+++ b/Source/Fractorium/FractoriumEmberController.cpp
@@ -72,12 +72,14 @@ FractoriumEmberController<T>::FractoriumEmberController(Fractorium* fractorium)
 {
 	m_PreviewRun = false;
 	m_PreviewRunning = false;
-	m_SheepTools = unique_ptr<SheepTools<T, T>>(new SheepTools<T, T>("flam3-palettes.xml", new EmberNs::Renderer<T, T>()));
+	m_SheepTools = unique_ptr<SheepTools<T, T>>(new SheepTools<T, T>(
+													QString(QApplication::applicationDirPath() + "flam3-palettes.xml").toLocal8Bit().data(),
+													new EmberNs::Renderer<T, T>()));
 	m_GLController = unique_ptr<GLEmberController<T>>(new GLEmberController<T>(fractorium, fractorium->ui.GLDisplay, this));
 	m_PreviewRenderer = unique_ptr<EmberNs::Renderer<T, T>>(new EmberNs::Renderer<T, T>());
 
 	//Initial combo change event to fill the palette table will be called automatically later.
-	if (!InitPaletteList("./"))
+	if (!InitPaletteList(QCoreApplication::applicationDirPath().toLocal8Bit().data()))
 		throw "No palettes found, exiting.";
 
 	BackgroundChanged(QColor(0, 0, 0));//Default to black.
diff --git a/Source/Fractorium/FractoriumPalette.cpp b/Source/Fractorium/FractoriumPalette.cpp
index 7623f46..7daf3ca 100644
--- a/Source/Fractorium/FractoriumPalette.cpp
+++ b/Source/Fractorium/FractoriumPalette.cpp
@@ -92,7 +92,7 @@ bool FractoriumEmberController<T>::FillPaletteTable(const string& s)
 		QTableWidget* paletteTable = m_Fractorium->ui.PaletteListTable;
 		QTableWidget* palettePreviewTable = m_Fractorium->ui.PalettePreviewTable;
 
-		m_CurrentPaletteFilePath = m_Fractorium->ui.PaletteFilenameCombo->property("path").toString().toStdString() + s;
+		m_CurrentPaletteFilePath = m_Fractorium->ui.PaletteFilenameCombo->property("path").toString().toStdString() + "/" + s;
 
 		if (size_t paletteSize = m_PaletteList.Size(m_CurrentPaletteFilePath))
 		{