Skip to content

Commit 79e9f9d

Browse files
ExtremsWinterMute
authored andcommitted
Fix CARD_SetStatus
(cherry picked from commit 39f106f)
1 parent 36aad67 commit 79e9f9d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

libogc/card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3156,8 +3156,8 @@ s32 CARD_SetStatusAsync(s32 chn,s32 fileno,card_stat *stats,cardcallback callbac
31563156

31573157
if(chn<EXI_CHANNEL_0 || chn>=EXI_CHANNEL_2) return CARD_ERROR_NOCARD;
31583158
if(fileno<0 || fileno>=CARD_MAXFILES) return CARD_ERROR_FATAL_ERROR;
3159-
if(stats->icon_addr!=-1 && stats->icon_addr>CARD_READSIZE) return CARD_ERROR_FATAL_ERROR;
3160-
if(stats->comment_addr!=-1 && stats->comment_addr>8128) return CARD_ERROR_FATAL_ERROR;
3159+
if(stats->icon_addr!=-1 && stats->icon_addr>=CARD_READSIZE) return CARD_ERROR_FATAL_ERROR;
3160+
if(stats->comment_addr!=-1 && (stats->comment_addr%8192)>8128) return CARD_ERROR_FATAL_ERROR;
31613161
if((ret=__card_getcntrlblock(chn,&card))<0) return ret;
31623162

31633163
ret = CARD_ERROR_BROKEN;
@@ -3171,7 +3171,7 @@ s32 CARD_SetStatusAsync(s32 chn,s32 fileno,card_stat *stats,cardcallback callbac
31713171
entry->comment_addr = stats->comment_addr;
31723172
__card_updateiconoffsets(entry,stats);
31733173

3174-
if(entry->icon_addr==-1) entry->icon_fmt = ((entry->icon_fmt&~CARD_ICON_MASK)|CARD_ICON_CI);
3174+
if(entry->icon_addr==-1) entry->icon_speed = ((entry->icon_speed&~CARD_SPEED_MASK)|CARD_SPEED_FAST);
31753175

31763176
entry->last_modified = ticks_to_secs(gettime());
31773177
if((ret=__card_updatedir(chn,callback))>=0) return ret;

0 commit comments

Comments
 (0)