summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-02 00:10:28 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-12 04:49:51 +0200
commitd9556912b4a21341727b525f650a6d861ad2d940 (patch)
treed38caccc59bf880c68b87445bd24c9ba42c5b17b
parentMerge pull request #914 from yuriks/bitfield-mask (diff)
downloadyuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar.gz
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar.bz2
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar.lz
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar.xz
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.tar.zst
yuzu-d9556912b4a21341727b525f650a6d861ad2d940.zip
-rw-r--r--src/core/hle/kernel/event.cpp2
-rw-r--r--src/core/hle/kernel/event.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index f338f3266..53feebbc0 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -21,7 +21,7 @@ SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) {
SharedPtr<Event> evt(new Event);
evt->signaled = false;
- evt->reset_type = evt->intitial_reset_type = reset_type;
+ evt->reset_type = reset_type;
evt->name = std::move(name);
return evt;
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h
index fba960d2a..89d405236 100644
--- a/src/core/hle/kernel/event.h
+++ b/src/core/hle/kernel/event.h
@@ -26,7 +26,6 @@ public:
static const HandleType HANDLE_TYPE = HandleType::Event;
HandleType GetHandleType() const override { return HANDLE_TYPE; }
- ResetType intitial_reset_type; ///< ResetType specified at Event initialization
ResetType reset_type; ///< Current ResetType
bool signaled; ///< Whether the event has already been signaled