From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 2 Sep 2010 05:31:47 +0000 (+0000)
Subject: Merged revisions 284632 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27cbcba2553b0d3c5125f70029e07f4a4dac3884;p=thirdparty%2Fasterisk.git

Merged revisions 284632 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284632 | tilghman | 2010-09-02 00:31:02 -0500 (Thu, 02 Sep 2010) | 14 lines

  Merged revisions 284631 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r284631 | tilghman | 2010-09-02 00:30:16 -0500 (Thu, 02 Sep 2010) | 7 lines

    Don't reset queue stats on a module reload.

    (closes issue #17535)
     Reported by: raarts
     Patches:
           20100819__issue17535.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 08167b4630..57cbc0b632 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -8186,7 +8186,7 @@ static int load_module(void)
 
 static int reload(void)
 {
-	struct ast_flags mask = {AST_FLAGS_ALL,};
+	struct ast_flags mask = {AST_FLAGS_ALL & ~QUEUE_RESET_STATS,};
 	ast_unload_realtime("queue_members");
 	reload_handler(1, &mask, NULL);
 	return 0;