diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-19 09:42:57 +0200 |
| commit | 87288e173f09d573460a06d98466f84cba8f4b5c (patch) | |
| tree | 2e0949deb7bc6c27e58feb870458dc1583cd4e07 /lib/gs/contribs/othello | |
| parent | adbad8f580825761238c647e181a07678f07d361 (diff) | |
| parent | 2d13b9580f405541e46491743702eaaedf3f6e91 (diff) | |
| download | otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.gz otp-87288e173f09d573460a06d98466f84cba8f4b5c.tar.bz2 otp-87288e173f09d573460a06d98466f84cba8f4b5c.zip | |
Merge branch 'dev' into major
* dev:
gs: Update to modern type guards in examples
os_mon: Check results from fgets in cpu_sup
erts: Remove compiler warning in sys.c
Diffstat (limited to 'lib/gs/contribs/othello')
| -rw-r--r-- | lib/gs/contribs/othello/othello_board.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl index 0206ba2ded..6ccb79b7e4 100644 --- a/lib/gs/contribs/othello/othello_board.erl +++ b/lib/gs/contribs/othello/othello_board.erl @@ -147,7 +147,7 @@ but_pressed("Help",_ButtId,_User,GamePid,_Shell,_Wids,_Op) -> but_pressed("Newgame",_ButtId,_User,GamePid,_Shell,Wids,Options) -> new_game(GamePid,Wids,Options); but_pressed([],ButtId,User,GamePid,_Shell,_Wids,_Op) - when pid(GamePid),User == player -> + when is_pid(GamePid),User == player -> [C,R] = atom_to_list(ButtId), GamePid ! {self(),position,othello_adt:pos(C-96,translate(R-48))}, GamePid; @@ -243,7 +243,7 @@ game_msg(Msg,User,GamePid,Shell,Wids,Options) -> end. -new_game(GamePid,Wids,Options) when pid(GamePid) -> +new_game(GamePid,Wids,Options) when is_pid(GamePid) -> exit(GamePid,kill), new_game(Wids,Options); new_game(_,Wids,Options) -> |