diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-03-04 13:17:46 +1300 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2014-03-04 13:17:46 +1300 |
| commit | 88b9a0de73cc5cfaf4be8c6e4776dae7b9d30262 (patch) | |
| tree | a6a9a2aaf2f06a501221e96858b746b5d87ed286 | |
| parent | 05a581ff28a2b9d65555492e8d9c5adc18afdfd4 (diff) | |
| parent | cd5aba3d2e03b094723a680405ab9b5d1931d806 (diff) | |
Merge pull request #4307 from Memphiz/tvoutnonativekeyboard
[ios] - only use the native keyboard if tvout is not used (native keyboa...
| -rw-r--r-- | xbmc/guilib/GUIKeyboardFactory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/guilib/GUIKeyboardFactory.cpp b/xbmc/guilib/GUIKeyboardFactory.cpp index 1f6d1581f1..0a3b583c57 100644 --- a/xbmc/guilib/GUIKeyboardFactory.cpp +++ b/xbmc/guilib/GUIKeyboardFactory.cpp @@ -32,6 +32,7 @@ #include "dialogs/GUIDialogKeyboardGeneric.h" #if defined(TARGET_DARWIN_IOS) #include "osx/ios/IOSKeyboard.h" +#include "windowing/WindowingFactory.h" #endif CGUIKeyboard *CGUIKeyboardFactory::g_activedKeyboard = NULL; @@ -93,7 +94,8 @@ bool CGUIKeyboardFactory::ShowAndGetInput(CStdString& aTextString, const CVarian headingStr = g_localizeStrings.Get((uint32_t)heading.asInteger()); #if defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2) - kb = new CIOSKeyboard(); + if (g_Windowing.GetCurrentScreen() == 0) + kb = new CIOSKeyboard(); #endif if(!kb) |