From b59ec7d8384842fe0058993f18283fc4af918a70 Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
Date: Sat, 6 Nov 2010 00:45:24 -0200
Subject: [PATCH] Fix for "SampleUtil_Initialize was called multiple times!"
 bug.

Fix for bug introduced in samples code in svn revision 502, commit
git:25c908c558c8e60eb386c155a6b93add447ffec0

Sample device and combo were aborting with the message:
"***** SampleUtil_Initialize was called multiple times!"
(cherry picked from commit ef7edf6cf8a0f1acafdaecaf09b30aaeaac91d10)
---
 ChangeLog                        | 8 ++++++++
 upnp/sample/common/sample_util.c | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3beb111..0b4133a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -221,6 +221,14 @@ Version 1.8.0
 Version 1.6.9
 *******************************************************************************
 
+2010-10-20 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
+
+	Fix for bug introduced in samples code in svn revision 502, commit
+	git:25c908c558c8e60eb386c155a6b93add447ffec0
+
+	Sample device and combo were aborting with the message:
+	"***** SampleUtil_Initialize was called multiple times!"
+
 2010-11-08 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
 
 	Make multiple SSDP advertisements faster.
diff --git a/upnp/sample/common/sample_util.c b/upnp/sample/common/sample_util.c
index a607553..fbfe1ea 100644
--- a/upnp/sample/common/sample_util.c
+++ b/upnp/sample/common/sample_util.c
@@ -82,9 +82,6 @@ int SampleUtil_Initialize(print_string print_function)
 		ithread_mutex_unlock(&display_mutex);
 
 		initialize_init = 0;
-	} else {
-		SampleUtil_Print("***** SampleUtil_Initialize was called multiple times!\n");
-		abort();
 	}
 
 	return UPNP_E_SUCCESS;