From a7158f6ea95cfad2287fe5e9655b0e0002adccd9 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Mon, 19 Mar 2012 14:41:05 +0530
Subject: [PATCH] fix in session expiry

---
 erpnext/startup/startup.js | 2 +-
 js/all-app.js              | 2 +-
 js/all-web.js              | 2 +-
 version.num                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index c00f09769c..6bfb8bf895 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -107,7 +107,7 @@ show_chart_browser = function(nm, chart_type){
 var update_messages = function(reset) {
 	// Updates Team Messages
 	
-	if(inList(['Guest'], user)) { return; }
+	if(inList(['Guest'], user) || !wn.session_alive) { return; }
 
 	if(!reset) {
 		$c_page('home', 'event_updates', 'get_global_status_messages', null,
diff --git a/js/all-app.js b/js/all-app.js
index 3cbb55ad30..0b9f4f9505 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -2272,7 +2272,7 @@ show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sale
 else if(nm=='Accounts Browser')
 pscript.make_chart(chart_type);}
 loadpage(nm,call_back);}
-var update_messages=function(reset){if(inList(['Guest'],user)){return;}
+var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;}
 if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}}
 show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
 erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
diff --git a/js/all-web.js b/js/all-web.js
index ced1963715..58ff8aca7c 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -1223,7 +1223,7 @@ show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sale
 else if(nm=='Accounts Browser')
 pscript.make_chart(chart_type);}
 loadpage(nm,call_back);}
-var update_messages=function(reset){if(inList(['Guest'],user)){return;}
+var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;}
 if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}}
 show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
 erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
diff --git a/version.num b/version.num
index 96e38be913..d1d06ad36a 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1110
\ No newline at end of file
+1111
\ No newline at end of file