From 9c0544a6e45280e5e6cb261d7d83376cef44d6f4 Mon Sep 17 00:00:00 2001
From: ClemensF <fischer.clemens@gmail.com>
Date: Fri, 17 May 2013 07:52:20 +0200
Subject: [PATCH] Fixed handling of default tile layer.

---
 MapControl/MapBase.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs
index 5506e521..ab977f77 100644
--- a/MapControl/MapBase.cs
+++ b/MapControl/MapBase.cs
@@ -416,7 +416,7 @@ namespace MapControl
         {
             Loaded -= OnLoaded;
 
-            if (TileLayer == null && TileLayers == null)
+            if (TileLayer == null)
             {
                 TileLayer = TileLayer.Default;
             }
@@ -528,7 +528,12 @@ namespace MapControl
 
         private void UpdateTileLayer()
         {
-            var tileLayer = TileLayers.FirstOrDefault();
+            TileLayer tileLayer = null;
+
+            if (TileLayers != null)
+            {
+                tileLayer = TileLayers.FirstOrDefault();
+            }
 
             if (TileLayer != tileLayer)
             {