gistfile1.diff

diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 271190d..8a0e2d3 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -25,54 +25,26 @@ public:
     ResetType intitial_reset_type;          ///< ResetType specified at Event initialization
     ResetType reset_type;                   ///< Current ResetType
 
-    bool locked;                            ///< Event signal wait
-    bool permanent_locked;                  ///< Hack - to set event permanent state (for easy passthrough)
-    std::vector<Handle> waiting_threads;    ///< Threads that are waiting for the event
+    bool signaled;                          ///< Whether the event has already been signaled
+    std::set<Handle> waiting_threads;       ///< Threads that are waiting for the event
     std::string name;                       ///< Name of event (optional)
 
     ResultVal<bool> WaitSynchronization() override {
-        bool wait = locked;
-        if (locked) {
-            Handle thread = GetCurrentThread()->GetHandle();
-            if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) {
-                waiting_threads.push_back(thread);
-            }
+        bool wait = !signaled;
+        if (wait) {
+            waiting_threads.insert(GetCurrentThread()->GetHandle());
             Kernel::WaitCurrentThread(WAITTYPE_EVENT, this);
         }
-        if (reset_type != RESETTYPE_STICKY && !permanent_locked) {
-            locked = true;
-        }
         return MakeResult<bool>(wait);
     }
 };
 
-/**
- * Hackish function to set an events permanent lock state, used to pass through synch blocks
- * @param handle Handle to event to change
- * @param permanent_locked Boolean permanent locked value to set event
- * @return Result of operation, 0 on success, otherwise error code
- */
-ResultCode SetPermanentLock(Handle handle, const bool permanent_locked) {
-    Event* evt = g_handle_table.Get<Event>(handle).get();
-    if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel);
-
-    evt->permanent_locked = permanent_locked;
-    return RESULT_SUCCESS;
-}
-
-/**
- * Changes whether an event is locked or not
- * @param handle Handle to event to change
- * @param locked Boolean locked value to set event
- * @return Result of operation, 0 on success, otherwise error code
- */
-ResultCode SetEventLocked(const Handle handle, const bool locked) {
+ResultCode SetEventSignaled(const Handle handle, const bool signaled) {
     Event* evt = g_handle_table.Get<Event>(handle).get();
-    if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel);
+    if (evt == nullptr) 
+        return InvalidHandle(ErrorModule::Kernel);
 
-    if (!evt->permanent_locked) {
-        evt->locked = locked;
-    }
+    evt->signaled = signaled;
     return RESULT_SUCCESS;
 }
 
@@ -83,26 +55,22 @@ ResultCode SetEventLocked(const Handle handle, const bool locked) {
  */
 ResultCode SignalEvent(const Handle handle) {
     Event* evt = g_handle_table.Get<Event>(handle).get();
-    if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel);
+    if (evt == nullptr)
+        return InvalidHandle(ErrorModule::Kernel);
+
+    evt->signaled = true;
 
     // Resume threads waiting for event to signal
-    bool event_caught = false;
-    for (size_t i = 0; i < evt->waiting_threads.size(); ++i) {
-        Thread* thread = Kernel::g_handle_table.Get<Thread>(evt->waiting_threads[i]).get();
+    for (auto thread_handle : evt->waiting_threads) {
+        Thread* thread = Kernel::g_handle_table.Get<Thread>(thread_handle).get();
         if (thread != nullptr)
-            thread->ResumeFromWait();
-
-        // If any thread is signalled awake by this event, assume the event was "caught" and reset
-        // the event. This will result in the next thread waiting on the event to block. Otherwise,
-        // the event will not be reset, and the next thread to call WaitSynchronization on it will
-        // not block. Not sure if this is correct behavior, but it seems to work.
-        event_caught = true;
+            thread->ResumeFromWait(evt);
     }
     evt->waiting_threads.clear();
 
-    if (!evt->permanent_locked) {
-        evt->locked = event_caught;
-    }
+    if (evt->reset_type != RESETTYPE_STICKY)
+        evt->signaled = false;
+
     return RESULT_SUCCESS;
 }
 
@@ -113,11 +81,10 @@ ResultCode SignalEvent(const Handle handle) {
  */
 ResultCode ClearEvent(Handle handle) {
     Event* evt = g_handle_table.Get<Event>(handle).get();
-    if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel);
+    if (evt == nullptr) 
+        return InvalidHandle(ErrorModule::Kernel);
 
-    if (!evt->permanent_locked) {
-        evt->locked = true;
-    }
+    evt->signaled = false;
     return RESULT_SUCCESS;
 }
 
@@ -134,8 +101,7 @@ Event* CreateEvent(Handle& handle, const ResetType reset_type, const std::string
     // TOOD(yuriks): Fix error reporting
     handle = Kernel::g_handle_table.Create(evt).ValueOr(INVALID_HANDLE);
 
-    evt->locked = true;
-    evt->permanent_locked = false;
+    evt->signaled = false;
     evt->reset_type = evt->intitial_reset_type = reset_type;
     evt->name = name;