Index: ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.xml	(revision 25760)
+++ ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.xml	(revision 25761)
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <object name="minimapPanel"
 	size="0 0 100% 100%"
 	sprite="mapPanel"
 	type="image"
 >
 
 	<!-- Background image -->
 	<object
 		type="image"
 		size="4 4 100%-4 100%-4"
 		sprite="stretched:session/minimap_circle_modern.png"
 		ghost="true"
 	/>
 
 	<!-- Idle Worker Button -->
 	<object name="idleWorkerButton"
 		type="button"
 		size="100%-119 100%-120 100%-4 100%-5"
 		tooltip_style="sessionToolTip"
 		hotkey="selection.idleworker"
 		sprite="stretched:session/minimap-idle.png"
 		sprite_over="stretched:session/minimap-idle-highlight.png"
 		sprite_disabled="stretched:session/minimap-idle-disabled.png"
 		mouse_event_mask="texture:session/minimap-idle.png"
 	/>
 
 	<!-- Diplomacy Colors Button -->
 	<object name="diplomacyColorsButton"
 		type="button"
 		size="4 100%-120 119 100%-5"
 		tooltip_style="sessionToolTip"
 		hotkey="session.diplomacycolors"
 	/>
 
 	<!-- Flare Button -->
 	<object
 		name="flareButton"
 		type="button"
 		size="3 3 118 118"
 		tooltip_style="sessionToolTip"
 		hotkey="session.flareactivate"
 		sprite="stretched:session/minimap-flare.png"
 		sprite_over="stretched:session/minimap-flare-highlight.png"
+		sprite_disabled="stretched:session/minimap-flare-disabled.png"
 		mouse_event_mask="texture:session/minimap-flare.png"
 	/>
 
 	<!-- MiniMap -->
 	<object
 		name="minimap"
 		size="8 8 100%-8 100%-8"
 		type="minimap"
 		mask="true"
 		flare_texture_count="16"
 		flare_render_size="32"
 		flare_animation_speed="7"
 		flare_interleave="true"
 		flare_lifetime_seconds="6"
 	/>
 </object>
Index: ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js	(revision 25760)
+++ ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapFlareButton.js	(revision 25761)
@@ -1,29 +1,35 @@
 /**
  * If the button that this class manages is pressed, an idle unit having one of the given classes is selected.
  */
 class MiniMapFlareButton
 {
-	constructor()
+	constructor(playerViewControl)
 	{
 		this.flareButton = Engine.GetGUIObjectByName("flareButton");
 		this.flareButton.onPress = this.onPress.bind(this);
 		registerHotkeyChangeHandler(this.onHotkeyChange.bind(this));
+		playerViewControl.registerViewedPlayerChangeHandler(this.rebuild.bind(this));
+	}
+
+	rebuild()
+	{
+		this.flareButton.enabled = !g_IsObserver;
 	}
 
 	onHotkeyChange()
 	{
 		this.flareButton.tooltip =
 			colorizeHotkey("%(hotkey)s" + " ", "session.flare") +
 			translate(this.Tooltip);
 	}
 
 	onPress()
 	{
 		if (g_IsObserver)
 			return;
 		if (inputState == INPUT_NORMAL)
 			inputState = INPUT_FLARE;
 	}
 }
 
 MiniMapFlareButton.prototype.Tooltip = markForTranslation("Send a flare to your allies");
Index: ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js	(revision 25760)
+++ ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js	(revision 25761)
@@ -1,23 +1,23 @@
 /**
  * This class is concerned with managing the different elements of the minimap panel.
  */
 class MiniMapPanel
 {
 	constructor(playerViewControl, diplomacyColors, idleWorkerClasses)
 	{
 		this.diplomacyColorsButton = new MiniMapDiplomacyColorsButton(diplomacyColors);
 		this.idleWorkerButton = new MiniMapIdleWorkerButton(playerViewControl, idleWorkerClasses);
-		this.flareButton = new MiniMapFlareButton();
+		this.flareButton = new MiniMapFlareButton(playerViewControl);
 		this.miniMap = new MiniMap();
 	}
 
 	flare(target, playerID)
 	{
 		return this.miniMap.flare(target, playerID);
 	}
 
 	isMouseOverMiniMap()
 	{
 		return this.miniMap.isMouseOverMiniMap();
 	}
 }