summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2014-12-05 13:34:11 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-12-05 13:34:11 -0500
commitb2d47c007080804b3efc1feca6f56942e0011f66 (patch)
treed2da45303c34be26aef35815940da84e4d5a842a
parent08e1f2f4f367d16d14263286998aed24f0e6267b (diff)
eeze_scanner needs to hash on the address of the pointer and not use direct_add()
this is an @fix for the constant crashing ref T1612
-rw-r--r--src/bin/eeze/eeze_scanner.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/eeze/eeze_scanner.c b/src/bin/eeze/eeze_scanner.c
index 07d1c9b..21c4495 100644
--- a/src/bin/eeze/eeze_scanner.c
+++ b/src/bin/eeze/eeze_scanner.c
@@ -45,7 +45,7 @@ event_send(const char *device, Eeze_Scanner_Event_Type type, Eina_Bool volume)
45 { 45 {
46 Eet_Connection *ec; 46 Eet_Connection *ec;
47 47
48 ec = eina_hash_find(clients, cl); 48 ec = eina_hash_find(clients, &cl);
49 if (!ec) continue; 49 if (!ec) continue;
50 INF("Serializing event..."); 50 INF("Serializing event...");
51 eet_connection_send(ec, es_edd, &ev, NULL); 51 eet_connection_send(ec, es_edd, &ev, NULL);
@@ -137,7 +137,7 @@ cl_add(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Add
137 return ECORE_CALLBACK_RENEW; 137 return ECORE_CALLBACK_RENEW;
138 } 138 }
139 139
140 eina_hash_direct_add(clients, ev->client, ec); 140 eina_hash_add(clients, &ev->client, ec);
141 cl_setup(ev->client, ec); 141 cl_setup(ev->client, ec);
142 return ECORE_CALLBACK_RENEW; 142 return ECORE_CALLBACK_RENEW;
143} 143}
@@ -148,10 +148,10 @@ cl_del(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Client_Del
148 Eet_Connection *ec; 148 Eet_Connection *ec;
149 Eina_Bool d; 149 Eina_Bool d;
150 INF("Removed client"); 150 INF("Removed client");
151 ec = eina_hash_find(clients, ev->client); 151 ec = eina_hash_find(clients, &ev->client);
152 if (ec) 152 if (ec)
153 { 153 {
154 eina_hash_del_by_data(clients, ec); 154 eina_hash_del_by_data(clients, &ec);
155 eet_connection_close(ec, &d); 155 eet_connection_close(ec, &d);
156 } 156 }
157 157