Commit 1fde7db5 authored by hsumita@chromium.org's avatar hsumita@chromium.org

Fix crash caused by uninstalling extension IME.


BUG=138494
TEST=manually checked on lumpy


Review URL: https://chromiumcodereview.appspot.com/10823096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149155 0039d316-1c4b-4281-b951-d872f2087c98
parent 482a4616
...@@ -886,8 +886,11 @@ class IBusEngineControllerImpl : public IBusEngineController { ...@@ -886,8 +886,11 @@ class IBusEngineControllerImpl : public IBusEngineController {
g_object_unref(chromeos_engine->table); g_object_unref(chromeos_engine->table);
chromeos_engine->table = NULL; chromeos_engine->table = NULL;
} }
if (ibus_bus_is_connected(chromeos_engine->connection->ibus_)) { if (chromeos_engine->connection &&
// We can't call destroy function without ibus-daemon connection, ibus_bus_is_connected(chromeos_engine->connection->ibus_)) {
// Connection may be NULL since extension IME can be uninstalled before
// |OnDestroy| is called.
// We can't call |destroy| function without ibus-daemon connection,
// otherwise browser goes into deadlock state. // otherwise browser goes into deadlock state.
// TODO(nona): investigate the reason of dead-lock. // TODO(nona): investigate the reason of dead-lock.
IBUS_OBJECT_CLASS(ibus_chromeos_engine_parent_class) IBUS_OBJECT_CLASS(ibus_chromeos_engine_parent_class)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment