Permalink
Browse files

Merge pull request #4319 from Memphiz/tvoutnonativekeyboard

[ios] - only use the native keyboard if tvout is not used (native keyboa...
  • Loading branch information...
2 parents 19fb433 + cd5aba3 commit 6d7aecd1a9c090e2eaf0815689d2286b31726484 @jmarshallnz jmarshallnz committed Mar 4, 2014
Showing with 3 additions and 1 deletion.
  1. +3 −1 xbmc/guilib/GUIKeyboardFactory.cpp
View
4 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)

0 comments on commit 6d7aecd

Please sign in to comment.