Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .nomedia file to Android assets #10047

Merged
merged 2 commits into from Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/android/app/build.gradle
Expand Up @@ -83,6 +83,8 @@ task prepareAssets() {
from "${projRoot}/textures" into "${assetsFolder}/textures"
}

file("${assetsFolder}/.nomedia").text = "";

task zipAssets(type: Zip) {
archiveName "Minetest.zip"
from "${assetsFolder}"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/touchscreengui.cpp
Expand Up @@ -1043,7 +1043,7 @@ void TouchScreenGUI::applyJoystickStatus()
if (i == 4 && !m_joystick_triggers_special1)
continue;

SEvent translated;
SEvent translated{};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this doesn't just have an empty diff?

translated.EventType = irr::EET_KEY_INPUT_EVENT;
translated.KeyInput.Key = id2keycode(m_joystick_names[i]);
translated.KeyInput.PressedDown = false;
Expand Down