Skip to content

Commit

Permalink
[sailfishos][gecko] Merge some bugfixes for embedding shutdown
Browse files Browse the repository at this point in the history
Conflicts:
	dom/base/nsJSEnvironment.cpp
	dom/events/EventStateManager.cpp

nemo_embedlite_31 sha1: b0d4d16
  • Loading branch information
romaxa authored and rainemak committed May 27, 2020
1 parent b26f2a0 commit 8bbc37f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions ipc/glue/MessagePump.cpp
Expand Up @@ -125,6 +125,7 @@ if (did_work && delayed_work_time_.is_null())
}

mDelayedWorkTimer->Cancel();
mDelayedWorkTimer = nullptr;

keep_running_ = true;
}
Expand Down

0 comments on commit 8bbc37f

Please sign in to comment.