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.

Sign up for GitHub

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

Jump to bottom

Compare String and DATE TIME Fixed #548

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compare String and DATE TIME Fixed #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion es-app/src/EmulationStation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define PROGRAM_VERSION_MAINTENANCE 1
#define PROGRAM_VERSION_STRING "2.0.1a"

#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__
#define PROGRAM_BUILT_STRING "Relased March 2015"

#define RESOURCE_VERSION_STRING "2,0,1\0"
#define RESOURCE_VERSION PROGRAM_VERSION_MAJOR,PROGRAM_VERSION_MINOR,PROGRAM_VERSION_MAINTENANCE
4 changes: 2 additions & 2 deletions es-core/src/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts, const HelpSt
// yes, it has!

// can we combine? (dpad only)
if((it->first == "up/down" && addPrompts.at(mappedTo->second).first == "left/right") ||
(it->first == "left/right" && addPrompts.at(mappedTo->second).first == "up/down"))
if((strcmp((it->first) , "up/down")) == 0 && strcmp(addPrompts.at(mappedTo->second).first , "left/right") == 0 ||
(strcmp((it->first) , "left/right") == 0 && strcmp(addPrompts.at(mappedTo->second).first , "up/down")) == 0)
{
// yes!
addPrompts.at(mappedTo->second).first = "up/down/left/right";
Expand Down
6 changes: 3 additions & 3 deletions es-core/src/components/ComponentGrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,15 +430,15 @@ std::vector<HelpPrompt> ComponentGrid::getHelpPrompts()
bool canScrollHoriz = mGridSize.x() > 1;
for(auto it = prompts.begin(); it != prompts.end(); it++)
{
if(it->first == "up/down/left/right")
if(strcmp((it->first) , "up/down/left/right") == 0)
{
canScrollHoriz = false;
canScrollVert = false;
break;
}else if(it->first == "up/down")
}else if(strcmp ((it->first) , "up/down") == 0)
{
canScrollVert = false;
}else if(it->first == "left/right")
}else if(strcmp ((it->first) , "left/right") == 0)
{
canScrollHoriz = false;
}
Expand Down
3 changes: 2 additions & 1 deletion es-core/src/components/ComponentList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "components/ComponentList.h"
#include "Util.h"
#include "Log.h"
#include <string.h>

#define TOTAL_HORIZONTAL_PADDING_PX 20

Expand Down Expand Up @@ -318,7 +319,7 @@ std::vector<HelpPrompt> ComponentList::getHelpPrompts()
bool addMovePrompt = true;
for(auto it = prompts.begin(); it != prompts.end(); it++)
{
if(it->first == "up/down" || it->first == "up/down/left/right")
if(strcmp((it->first) , "up/down") == 0 || strcmp((it->first) , "up/down/left/right") == 0)
{
addMovePrompt = false;
break;
Expand Down