Do not change the lightbar color on screen if call failed

igor725 · Mar 23, 2024 · dc9bd12 · dc9bd12
1 parent 4e1502a
commit dc9bd12
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/input/controller.cpp b/input/controller.cpp
@@ -3,14 +3,14 @@
 
 Controller::Controller() {
 	this->currPadColor = 0;
-	this->padColors[0] = {0xff, 0xff, 0xff};
-	this->padColors[1] = {0x00, 0xff, 0x00};
-	this->padColors[2] = {0xff, 0x00, 0x00};
-	this->padColors[3] = {0x00, 0x00, 0xff};
-	this->padColors[4] = {0xff, 0xff, 0x00};
-	this->padColors[5] = {0xff, 0x00, 0xff};
-	this->padColors[6] = {0x00, 0xff, 0xff};
-	this->padColors[7] = {0xff, 0xff, 0xff};
+	this->padColors[0] = {0xff, 0xff, 0xff, 0xff};
+	this->padColors[1] = {0x00, 0xff, 0x00, 0xff};
+	this->padColors[2] = {0xff, 0x00, 0x00, 0xff};
+	this->padColors[3] = {0x00, 0x00, 0xff, 0xff};
+	this->padColors[4] = {0xff, 0xff, 0x00, 0xff};
+	this->padColors[5] = {0xff, 0x00, 0xff, 0xff};
+	this->padColors[6] = {0x00, 0xff, 0xff, 0xff};
+	this->padColors[7] = {0xff, 0xff, 0xff, 0xff};
 }
 
 Controller::~Controller() {}
@@ -163,8 +163,10 @@ bool Controller::TouchpadPressed() {
 }
 
 OrbisPadColor Controller::NextColor() {
-	scePadSetLightBar(this->pad, &this->padColors[this->currPadColor = (this->currPadColor + 1) % 7]);
-	return this->padColors[this->currPadColor];
+	if (scePadSetLightBar(this->pad, &this->padColors[this->currPadColor = (this->currPadColor + 1) % 7]) == 0)
+		return this->padColors[this->currPadColor];
+
+	return {0x00, 0x00, 0x00, 0x00};
 }
 
 void Controller::ReadSticks(float *leftx, float *lefty, float *rightx, float *righty) {

diff --git a/input/main.cpp b/input/main.cpp
@@ -16,6 +16,8 @@ std::stringstream debugLogStream;
 int frameID = 0;
 
 static void repaintBar(PNG *png, OrbisPadColor newColor) {
+	if (newColor.a == 0) return;
+
 	static uint32_t prevColor = 0xFFFFFFFF;
 	uint32_t newColorU32 =
 		((uint32_t)newColor.r << 00) |