diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-09-21 19:25:30 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-09-21 19:25:30 -0400 |
| commit | 9e2b9e2471f12d23926caaffdf9871566de05d4c (patch) | |
| tree | 6f1e03c045be24d3d43437ed04de9806c30ca3cc /Source/Core | |
| parent | 770a9a42a504c9506c4c96d4933e326844a9cdde (diff) | |
| parent | 76ad89ebb690629df94b82e419b83c0f687cf85a (diff) | |
Merge pull request #1139 from lioncash/videodlg-osx
DolphinWX: Fix the video dialog crashing Dolphin on OSX
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/VideoConfigDiag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 0a28d53c89..0773a9bf46 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -201,7 +201,7 @@ protected: label_adapter->Disable(); } -#if !defined(_APPLE_) +#ifndef __APPLE__ // This isn't supported on OSX. choice_display_resolution->Disable(); |