fixed longstanding bug affection CDEFS where values from

rrds with different resolutions got mixed ..

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@97 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index c174370..ab2bd36 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -397,10 +397,10 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx,
                     * row in the rra (skip over non-relevant
                     * data sources)
                     */
+                   rpnstack -> s[++stptr] =  *(rpnp[rpi].data);
                    if (data_idx % rpnp[rpi].step == 0){
                        rpnp[rpi].data += rpnp[rpi].ds_cnt;
                    }
-                   rpnstack -> s[++stptr] =  *(rpnp[rpi].data);
                }
                break;
            case OP_PREV: