diff options
| author | June McEnroe <june@causal.agency> | 2019-01-04 16:27:40 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2019-01-04 16:27:40 -0500 |
| commit | ce215608a70576dbf687882f4028d5763afd0346 (patch) | |
| tree | 4df3a5e5e105cffd057585cbb2fb7146c72ed81c /merge.c | |
| parent | Call cap_enter in client and server (diff) | |
| parent | Re-create help page (diff) | |
| download | torus-ce215608a70576dbf687882f4028d5763afd0346.tar.gz torus-ce215608a70576dbf687882f4028d5763afd0346.zip | |
Merge branch 'backport'
Diffstat (limited to '')
| -rw-r--r-- | merge.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/merge.c b/merge.c index 997f97f..0e45c84 100644 --- a/merge.c +++ b/merge.c @@ -105,11 +105,14 @@ int main(int argc, char *argv[]) { if (!countA && !countB) break; if (!countA || !countB) errx(EX_DATAERR, "different size inputs"); - const struct Tile *tileC = (tileA.meta.accessTime > tileB.meta.accessTime) + struct Meta metaA = tileMeta(&tileA); + struct Meta metaB = tileMeta(&tileB); + + const struct Tile *tileC = (metaA.accessTime > metaB.accessTime) ? &tileA : &tileB; - if (tileA.meta.modifyTime != tileB.meta.modifyTime) { + if (metaA.modifyTime != metaB.modifyTime) { drawTile(0, &tileA); drawTile(CellRows + 1, &tileB); move(CellRows * 2 + 2, 0); |