From 26f110c7afeb71da959171df942346face0a0199 Mon Sep 17 00:00:00 2001
From: Erik Lindahl <erik@kth.se>
Date: Fri, 12 Jun 2015 21:49:27 +0200
Subject: [PATCH] Fix segfault with timer reset and -nb cpu

Fixes #1710.

Change-Id: I701b8bb6111fd43379997b7af0aedae7a5fe567a
---
 src/programs/mdrun/md.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/programs/mdrun/md.cpp b/src/programs/mdrun/md.cpp
index f6c3465c8d..4c34f399c1 100644
--- a/src/programs/mdrun/md.cpp
+++ b/src/programs/mdrun/md.cpp
@@ -133,7 +133,10 @@ static void reset_all_counters(FILE *fplog, t_commrec *cr,
     md_print_warn(cr, fplog, "step %s: resetting all time and cycle counters\n",
                   gmx_step_str(step, sbuf));
 
-    nbnxn_gpu_reset_timings(nbv);
+    if (use_GPU(nbv))
+    {
+        nbnxn_gpu_reset_timings(nbv);
+    }
 
     wallcycle_stop(wcycle, ewcRUN);
     wallcycle_reset_all(wcycle);
-- 
2.22.0