Skip to content

Commit 7932315

Browse files
committed
Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into icewm-1-4-BRANCH
2 parents 4a42167 + 65ffef7 commit 7932315

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/icewmbg.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,13 @@ YColor Background::getTransparencyColor() {
513513
}
514514

515515
void Background::randinit(long seed) {
516-
#ifndef HAVE_ARC4RANDOM_UNIFORM
517516
if (randInited == false) {
517+
#ifndef HAVE_ARC4RANDOM_UNIFORM
518518
timeval now = walltime();
519519
srand(unsigned((seed + mypid) * now.tv_sec + now.tv_usec));
520520
randInited = true;
521-
}
522521
#endif
522+
}
523523
}
524524

525525
int Background::randmax(int upper) {

src/wmprog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ class DProgram: public DObject, public RProgram {
108108
YStringArray& args);
109109
void open() override;
110110
private:
111+
using RProgram::open;
111112
YSMListener* smActionListener;
112113
};
113114

0 commit comments

Comments
 (0)