From 3e6f50e57527c740afe402767844b22afb8c1eb9 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 25 Oct 2015 11:55:17 +0100
Subject: [PATCH] Fix panel switch between error & working

---
 js/public/app.js   | 1 +
 templates/main.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/public/app.js b/js/public/app.js
index c89b1e7..d6c12ba 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -211,6 +211,7 @@ app.controller('WeatherController', ['$scope', '$interval', '$timeout', '$compil
 					else if ($scope.currentCity.wind.deg > 288 && $scope.currentCity.wind.deg < 334) {
 						$scope.currentCity.wind.desc = "North-West";
 					}
+					$scope.cityLoadError = '';
 				}
 				else {
 					$scope.cityLoadError = 'Failed to get city weather informations. Please contact your administrator';
diff --git a/templates/main.php b/templates/main.php
index ada6691..ba2a052 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -45,7 +45,7 @@
 	<div id="city-right" ng-show="cityLoadError != ''">
 		<span class="city-load-error">{{ cityLoadError }}</span>
 	</div>
-	<div id="city-right" ng-show="currentCity != null" style="background-image: url('{{ owncloudAppImgPath }}/img/{{ currentCity.image }}');">
+	<div id="city-right" ng-show="cityLoadError == '' && currentCity != null" style="background-image: url('{{ owncloudAppImgPath }}/img/{{ currentCity.image }}');">
 		<div id="city-weather-panel">
 			<div class="city-name">
 				{{ currentCity.name }}, {{ currentCity.sys.country }}