Index: calendar.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/calendar/calendar.inc,v
retrieving revision 1.13.2.16
diff -u -p -r1.13.2.16 calendar.inc
--- calendar.inc	3 Mar 2008 06:37:06 -0000	1.13.2.16
+++ calendar.inc	6 Apr 2008 13:14:26 -0000
@@ -17,7 +17,9 @@ function _calendar_views_query_alter(&$q
   if ($view->build_type == 'block') {
     $query->calendar_type = 'month';
     $view->calendar_display = $display_formats['block'];
-    $view->args = explode('/', str_replace($view->url .'/', '', $_GET['q']));
+    if (empty($view->args)) {
+      $view->args = explode('/', str_replace($view->url .'/', '', $_GET['q']));
+    }
     foreach ($view->argument as $delta => $argument) {
       // Special handling for OG gid argument.
       // Find a default value for the gid when used in a block.