Merge pull request #8643 from jordan-woyak/mapping-race-fix

InputCommon/DolphinQt: Mapping related race fixes and cleanups.
dolphin-emu · Feb 25, 2020 · 459b472 · 459b472
2 parents 25d5f0d + 6b109bd
commit 459b472
Show file tree

Hide file tree

Showing 9 changed files with 389 additions and 467 deletions.
diff --git a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
@@ -544,7 +544,7 @@ void InputStateDelegate::paint(QPainter* painter, const QStyleOptionViewItem& op
   rect.setWidth(rect.width() * std::clamp(state, 0.0, 1.0));
 
   // Create a temporary indicator object to retreive color constants.
-  MappingIndicator indicator(nullptr);
+  MappingIndicator indicator;
 
   painter->save();