diff -Nru arx-libertatis-1.1.1/CHANGELOG arx-libertatis-1.1.2/CHANGELOG
--- arx-libertatis-1.1.1/CHANGELOG	2013-07-17 02:16:42.000000000 +0000
+++ arx-libertatis-1.1.2/CHANGELOG	2013-10-17 17:25:04.000000000 +0000
@@ -1,8 +1,16 @@
 
+= Arx Libertatis 1.1.2  (2013-10-17) =
+
+* Fixed a crash when hovering over map markers after the window was resized (bug #547)
+
+################################################################################
+
 = Arx Libertatis 1.1.1  (2013-07-17) =
 
 * Fixed map marker labels not being saved
 
+################################################################################
+
 = Arx Libertatis 1.1  (2013-07-14) =
 
 New Features:
diff -Nru arx-libertatis-1.1.1/VERSION arx-libertatis-1.1.2/VERSION
--- arx-libertatis-1.1.1/VERSION	2013-07-17 02:16:42.000000000 +0000
+++ arx-libertatis-1.1.2/VERSION	2013-10-17 17:25:04.000000000 +0000
@@ -1,7 +1,7 @@
-Arx Libertatis 1.1.1
+Arx Libertatis 1.1.2
 
 Bug Tracker Version ID:
-9
+10
 
 Release Codename:
 Rhaa Movis
diff -Nru arx-libertatis-1.1.1/debian/changelog arx-libertatis-1.1.2/debian/changelog
--- arx-libertatis-1.1.1/debian/changelog	2013-07-17 02:16:58.000000000 +0000
+++ arx-libertatis-1.1.2/debian/changelog	2013-10-17 17:25:38.000000000 +0000
@@ -1,3 +1,10 @@
+arx-libertatis (1.1.2-0ppa1~saucy) saucy; urgency=low
+
+  * Bump version to 1.1.2 (new upstream release):
+  * Fixed a crash when hovering over map markers after the window was resized
+
+ -- Daniel Scharrer <daniel@constexpr.org>  Thu, 17 Oct 2013 19:24:57 +0200
+
 arx-libertatis (1.1.1-0ppa1~saucy) saucy; urgency=low
 
   * Bump version to 1.1.1 (new upstream release):
diff -Nru arx-libertatis-1.1.1/src/core/Core.cpp arx-libertatis-1.1.2/src/core/Core.cpp
--- arx-libertatis-1.1.1/src/core/Core.cpp	2013-07-17 02:16:42.000000000 +0000
+++ arx-libertatis-1.1.2/src/core/Core.cpp	2013-10-17 17:25:04.000000000 +0000
@@ -676,7 +676,7 @@
 	ARXMenu_Options_Control_SetInvertMouse(config.input.invertMouse);
 	ARXMenu_Options_Control_SetMouseSensitivity(config.input.mouseSensitivity);
 	
-	g_miniMap.firstInit(&player, resources, &entities, hFontInGameNote);
+	g_miniMap.firstInit(&player, resources, &entities);
 	
 	Project.torch = Color3f(1.f, 0.8f, 0.66666f);
 	LogDebug("InitializeDanae");
diff -Nru arx-libertatis-1.1.1/src/gui/MiniMap.cpp arx-libertatis-1.1.2/src/gui/MiniMap.cpp
--- arx-libertatis-1.1.1/src/gui/MiniMap.cpp	2013-07-17 02:16:42.000000000 +0000
+++ arx-libertatis-1.1.2/src/gui/MiniMap.cpp	2013-10-17 17:25:04.000000000 +0000
@@ -231,7 +231,7 @@
 	}
 }
 
-void MiniMap::firstInit(ARXCHARACTER *pl, PakReader *pakRes, EntityManager *entityMng, Font *font) {
+void MiniMap::firstInit(ARXCHARACTER *pl, PakReader *pakRes, EntityManager *entityMng) {
 	
 	m_pTexDetect = NULL;
 	m_mapMarkerTexCont = NULL;
@@ -246,7 +246,6 @@
 	m_currentLevel = 0;
 	m_entities = entityMng;
 	m_activeBkg = NULL;
-	m_font = font;
 	
 	resetLevels();
 	
@@ -450,9 +449,9 @@
 				Rect::Num bottom = checked_range_cast<Rect::Num>((bRect.bottom) * Yratio);
 				Rect rRect = Rect(left, top, right, bottom);
 				
-				long lLengthDraw = ARX_UNICODE_ForceFormattingInRect(m_font, m_mapMarkers[i].m_text, rRect);
+				long lLengthDraw = ARX_UNICODE_ForceFormattingInRect(hFontInGameNote, m_mapMarkers[i].m_text, rRect);
 				
-				DrawBookTextInRect(m_font, float(bRect.left), float(bRect.top), float(bRect.right), m_mapMarkers[i].m_text.substr(0, lLengthDraw), Color::none);
+				DrawBookTextInRect(hFontInGameNote, float(bRect.left), float(bRect.top), float(bRect.right), m_mapMarkers[i].m_text.substr(0, lLengthDraw), Color::none);
 			}
 		}
 		
diff -Nru arx-libertatis-1.1.1/src/gui/MiniMap.h arx-libertatis-1.1.2/src/gui/MiniMap.h
--- arx-libertatis-1.1.1/src/gui/MiniMap.h	2013-07-17 02:16:42.000000000 +0000
+++ arx-libertatis-1.1.2/src/gui/MiniMap.h	2013-10-17 17:25:04.000000000 +0000
@@ -104,7 +104,7 @@
 	size_t mapMarkerCount();
 	MapMarkerData mapMarkerGet(size_t id);
 	
-	void firstInit(ARXCHARACTER *pl, PakReader *pakRes, EntityManager *entityMng, Font *font); // This should be a constructor
+	void firstInit(ARXCHARACTER *pl, PakReader *pakRes, EntityManager *entityMng); // This should be a constructor
 	void reset();
 	void purgeTexContainer();
 	
@@ -153,7 +153,6 @@
 	int m_currentLevel;
 	EntityManager *m_entities;
 	EERIE_BACKGROUND *m_activeBkg;
-	Font *m_font;
 	
 	float m_miniOffsetX[MAX_MINIMAP_LEVELS];
 	float m_miniOffsetY[MAX_MINIMAP_LEVELS];