From 144f9f09e7ec0e4660a57798d39c7d24c981e6a9 Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Tue, 25 Oct 2005 02:19:01 +0000
Subject: * src/tls/tls.erl: Accept {error,already_loaded} from
 erl_ddll:load_driver/2 * src/stringprep/stringprep.erl: Likewise *
 src/mod_irc/iconv.erl: Likewise * src/ejabberd_app.erl: Likewise

SVN Revision: 427
---
 src/mod_irc/iconv.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mod_irc')

diff --git a/src/mod_irc/iconv.erl b/src/mod_irc/iconv.erl
index ced941ac9..1e4ef7a94 100644
--- a/src/mod_irc/iconv.erl
+++ b/src/mod_irc/iconv.erl
@@ -31,7 +31,10 @@ start_link() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
 init([]) ->
-    ok = erl_ddll:load_driver(ejabberd:get_so_path(), iconv_erl),
+    case erl_ddll:load_driver(ejabberd:get_so_path(), iconv_erl) of
+	ok -> ok;
+	{error, already_loaded} -> ok
+    end,
     Port = open_port({spawn, iconv_erl}, []),
     ets:new(iconv_table, [set, public, named_table]),
     ets:insert(iconv_table, {port, Port}),
-- 
cgit v1.2.3